diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
| commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
| tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/tools/security/clamav | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
kill libiconvOr*
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/security/clamav')
| -rw-r--r-- | pkgs/tools/security/clamav/default.nix | 12 |
1 files changed, 5 insertions, 7 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; |