Improved granularity of the GnuPG 2.x expression.
Use ${NIXPKGS_CONFIG} to enable or disable optional support for various libraries: gnupg = { ldap = true; // needs openldap bzip2 = true; // needs libbzip2 usb = true; // needs libusb curl = true; // needs curl }; Per default, all options are enabled (which is what the expression used to do prior to this patch). Furthermore, there is the legacy option gnupg = { idea = false; }; for GnuPG version 1.x, which is disabled by default. GnuPG 2 ignores this option. svn path=/nixpkgs/trunk/; revision=13126
This commit is contained in:
parent
a7ec87e557
commit
99893c8aec
1 changed files with 5 additions and 2 deletions
|
@ -757,8 +757,11 @@ let
|
|||
};
|
||||
|
||||
gnupg2 = import ../tools/security/gnupg2 {
|
||||
inherit fetchurl stdenv readline openldap bzip2 zlib libgpgerror pth
|
||||
libgcrypt libassuan libksba libusb curl;
|
||||
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;
|
||||
};
|
||||
|
||||
gnuplot = import ../tools/graphics/gnuplot {
|
||||
|
|
Loading…
Reference in a new issue