public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnupg: Use pintenty-mac on Darwin by default

Browse Source
This commit is contained in:
Kirill Elagin 2016-06-17 12:36:44 +03:00
parent 213dc21443
commit 22f2f6e045
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -1845,8 +1845,12 @@ in
gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; gnupg20 = callPackage ../tools/security/gnupg/20.nix {
gnupg21 = callPackage ../tools/security/gnupg/21.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; gnupg = gnupg21;
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };