diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 9140474114e..e1c4d0d602a 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -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; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dce65fef42..a7300df8f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };