diff options
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/clamav/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/20.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/opensc/default.nix | 4 |
3 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 11e08d502ed9..350a6f369f0d 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, libiconvOrNull, libxml2, openssl, ncurses, curl }: +{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }: stdenv.mkDerivation rec { name = "clamav-${version}"; version = "0.98.6"; @@ -8,20 +8,18 @@ stdenv.mkDerivation rec { sha256 = "0l99a0shgzpl8rvrrgbm1ki2zxlb7g1n82bhq7f2snj4amfj94b5"; }; - buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl ] - ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull; + buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv ]; configureFlags = [ "--with-zlib=${zlib}" "--with-libbz2-prefix=${bzip2}" - ] ++ (stdenv.lib.optional (libiconvOrNull != null) - "--with-iconv-dir=${libiconvOrNull}") - ++ [ + "--with-iconv-dir=${libiconv}" "--with-xml=${libxml2}" "--with-openssl=${openssl}" "--with-libncurses-prefix=${ncurses}" "--with-libcurl=${curl}" - "--disable-clamav" ]; + "--disable-clamav" + ]; meta = with stdenv.lib; { homepage = http://www.clamav.net; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index a584f2d1d853..0fcf334bee0b 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan -, libksba, coreutils, libiconvOrEmpty +, libksba, coreutils, libiconv # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth - openldap bzip2 libusb curl ] - ++ libiconvOrEmpty; + openldap bzip2 libusb curl libiconv ]; patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 42303fc356aa..31ad1108ddad 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconvOrNull, pcsclite +{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite , libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig - libXt libxslt libiconvOrNull docbook_xml_dtd_412 + libXt libxslt libiconv docbook_xml_dtd_412 ]; configureFlags = [ |