diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b9b25c91d6c3..abd483d477737b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1845,8 +1845,12 @@ in gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 - gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; - gnupg21 = callPackage ../tools/security/gnupg/21.nix { }; + gnupg20 = callPackage ../tools/security/gnupg/20.nix { + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + }; + gnupg21 = callPackage ../tools/security/gnupg/21.nix { + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry; + }; gnupg = gnupg21; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };