pinentry: override pinentry_ncurses instead of the other way around
This commit is contained in:
parent
49993bec81
commit
bd0d521774
|
@ -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;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue