diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:55:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:58:54 +0100 |
| commit | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (patch) | |
| tree | a95502fbc6cb68e944d1aa5202d024c97365b09c /pkgs/tools/security/clamav | |
| parent | 5b00625aa434205774d3e1cd43852ca1cbffc046 (diff) | |
| download | nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.gz nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.bz2 nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.lz nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.xz nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.zst nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.zip | |
iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit; I changed that as I'm not sure whether passing null values to buildInputs is clean. CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
Diffstat (limited to 'pkgs/tools/security/clamav')
| -rw-r--r-- | pkgs/tools/security/clamav/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 7dc13b3d11b..6cbc82b2695 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }: +{ stdenv, fetchurl, zlib, bzip2, libiconvOrNull, libxml2, openssl, ncurses, curl }: stdenv.mkDerivation rec { name = "clamav-${version}"; version = "0.98.4"; @@ -8,12 +8,15 @@ stdenv.mkDerivation rec { sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k"; }; - buildInputs = [ zlib bzip2 libiconv libxml2 openssl ncurses curl ]; + buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl ] + ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull; configureFlags = [ "--with-zlib=${zlib}" "--with-libbz2-prefix=${bzip2}" - "--with-iconv-dir=${libiconv}" + ] ++ (stdenv.lib.optional (libiconvOrNull != null) + "--with-iconv-dir=${libiconvOrNull}") + ++ [ "--with-xml=${libxml2}" "--with-openssl=${openssl}" "--with-libncurses-prefix=${ncurses}" |