public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill libiconvOr*

Browse Source 
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
This commit is contained in:
Eric Seidel
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/clamav/default.nix
+5 -7
View File
@@ -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;