b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pinentry: override pinentry_ncurses instead of the other way around

Browse source
This commit is contained in:
Jan Tojnar 2017-12-16 04:39:29 +01:00
parent 49993bec81
commit bd0d521774
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/no-x-libs.nix
View file

@ -35,7 +35,7 @@ with lib;
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
pinentry = pkgs.pinentry.override { gtk2 = null; };
pinentry = pkgs.pinentry_ncurses;
};
};
}

7
pkgs/top-level/all-packages.nix
View file

@ -3975,11 +3975,12 @@ with pkgs;
philter = callPackage ../tools/networking/philter { };
pinentry = callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap;
pinentry = pinentry_ncurses.override {
inherit gtk2;
};
pinentry_ncurses = pinentry.override {
pinentry_ncurses = callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap;
gtk2 = null;
};