diff options
| author | Russell O'Connor <roconnor@celes.l5.ca> | 2014-09-16 18:24:33 -0400 |
|---|---|---|
| committer | Russell O'Connor <roconnor@celes.l5.ca> | 2014-09-16 18:28:11 -0400 |
| commit | 1274724c6294451a299b830cb4b769290d0c5f8d (patch) | |
| tree | a9316b54e622098b3e8400f0359dae1e1b101670 /pkgs/tools/security | |
| parent | ae8629a0d4f7f9b6f9ea21f6adaae08fd5d542b8 (diff) | |
| download | nixlib-1274724c6294451a299b830cb4b769290d0c5f8d.tar nixlib-1274724c6294451a299b830cb4b769290d0c5f8d.tar.gz nixlib-1274724c6294451a299b830cb4b769290d0c5f8d.tar.bz2 nixlib-1274724c6294451a299b830cb4b769290d0c5f8d.tar.lz nixlib-1274724c6294451a299b830cb4b769290d0c5f8d.tar.xz nixlib-1274724c6294451a299b830cb4b769290d0c5f8d.tar.zst nixlib-1274724c6294451a299b830cb4b769290d0c5f8d.zip | |
Remove use* options and let the user set optional dependies to null if
they don't want to use them.
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/gnupg/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index ff354169dccf..d75abc09544d 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -1,15 +1,8 @@ { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan , libksba, coreutils, libiconvOrEmpty -, pinentry -, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null -, useUsb ? true, libusb ? null, useCurl ? true, curl ? null +, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null }: -assert useLdap -> (openldap != null); -assert useBzip2 -> (bzip2 != null); -assert useUsb -> (libusb != null); -assert useCurl -> (curl != null); - stdenv.mkDerivation rec { name = "gnupg-2.0.26"; @@ -19,12 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs - = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ] - ++ libiconvOrEmpty - ++ stdenv.lib.optional useLdap openldap - ++ stdenv.lib.optional useBzip2 bzip2 - ++ stdenv.lib.optional useUsb libusb - ++ stdenv.lib.optional useCurl curl; + = [ readline zlib libgpgerror libgcrypt libassuan libksba pth + openldap bzip2 libusb curl ] + ++ libiconvOrEmpty; patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i |