From 9c812655cec2248d45c9da8c4df5991270990587 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:45 +0000 Subject: 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 --- pkgs/top-level/all-packages.nix | 13 +++++-------- 1 file 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 { -- cgit 1.4.1