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.
This commit is contained in:
Vladimír Čunát
2014-11-03 12:58:54 +01:00
parent 5b00625aa4
commit ed867a50eb
7 changed files with 30 additions and 22 deletions
+6 -3
View File
@@ -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}"