diff options
| author | Peter Simons <simons@cryp.to> | 2010-05-19 12:25:45 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2010-05-19 12:25:45 +0000 |
| commit | 9c812655cec2248d45c9da8c4df5991270990587 (patch) | |
| tree | 5d864f011fd52e60fb907a0f7ce8b9335561ba0d | |
| parent | 807ed4dea3f10312ff03b94346e4560fe2441040 (diff) | |
| download | nixlib-9c812655cec2248d45c9da8c4df5991270990587.tar nixlib-9c812655cec2248d45c9da8c4df5991270990587.tar.gz nixlib-9c812655cec2248d45c9da8c4df5991270990587.tar.bz2 nixlib-9c812655cec2248d45c9da8c4df5991270990587.tar.lz nixlib-9c812655cec2248d45c9da8c4df5991270990587.tar.xz nixlib-9c812655cec2248d45c9da8c4df5991270990587.tar.zst nixlib-9c812655cec2248d45c9da8c4df5991270990587.zip | |
pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU Privacy Guard
Changed 'gnupg' and 'gnupg2' expressions to allow for argument overriding instead of relying on getPkgConfig. svn path=/nixpkgs/trunk/; revision=21862
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa0db3e20f70..dc1fcd6bb847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -807,17 +807,14 @@ let inherit fetchurl stdenv ed; }); - gnupg = import ../tools/security/gnupg { + gnupg = makeOverridable (import ../tools/security/gnupg) { inherit fetchurl stdenv readline bzip2; - ideaSupport = getPkgConfig "gnupg" "idea" false; # enable for IDEA crypto support + ideaSupport = false; }; - gnupg2 = import ../tools/security/gnupg2 { - inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib; - openldap = if getPkgConfig "gnupg" "ldap" true then openldap else null; - 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; + gnupg2 = makeOverridable (import ../tools/security/gnupg2) { + inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib + openldap bzip2 libusb curl; }; gnuplot = import ../tools/graphics/gnuplot { |