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

pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU Privacy Guard

Browse Source 
Changed 'gnupg' and 'gnupg2' expressions to allow for argument overriding
instead of relying on getPkgConfig.

svn path=/nixpkgs/trunk/; revision=21862
This commit is contained in:
Peter Simons 2010-05-19 12:25:45 +00:00
parent 807ed4dea3
commit 9c812655ce
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -807,17 +807,14 @@ let
inherit fetchurl stdenv ed; inherit fetchurl stdenv ed;
}); });
gnupg = import ../tools/security/gnupg { gnupg = makeOverridable (import ../tools/security/gnupg) {
inherit fetchurl stdenv readline bzip2; inherit fetchurl stdenv readline bzip2;
ideaSupport = getPkgConfig "gnupg" "idea" false; # enable for IDEA crypto support ideaSupport = false;
}; };
gnupg2 = import ../tools/security/gnupg2 { gnupg2 = makeOverridable (import ../tools/security/gnupg2) {
inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib; inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib
openldap = if getPkgConfig "gnupg" "ldap" true then openldap else null; openldap bzip2 libusb curl;
bzip2 = if getPkgConfig "gnupg" "bzip2" true then bzip2 else null;
libusb = if getPkgConfig "gnupg" "usb" true then libusb else null;
curl = if getPkgConfig "gnupg" "curl" true then curl else null;
}; };
gnuplot = import ../tools/graphics/gnuplot { gnuplot = import ../tools/graphics/gnuplot {