clamav: don't bundle freshclam config with package

Building clamav is expensive due to the bundled llvm.

Closes #20304.
This commit is contained in:
Franz Pletz 2016-11-15 02:02:25 +01:00
parent 999ac3056d
commit 02e9c88d77
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 5 additions and 6 deletions

View File

@ -16,7 +16,7 @@ let
${cfg.daemon.extraConfig} ${cfg.daemon.extraConfig}
''; '';
pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; }; pkg = pkgs.clamav;
in in
{ {
options = { options = {

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
, libmilter, pcre, freshclamConf ? null }: , libmilter, pcre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clamav-${version}"; name = "clamav-${version}";
@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn";
}; };
buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; buildInputs = [
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
];
configureFlags = [ configureFlags = [
"--with-zlib=${zlib.dev}" "--with-zlib=${zlib.dev}"
@ -22,11 +24,8 @@ stdenv.mkDerivation rec {
"--with-libcurl=${curl.dev}" "--with-libcurl=${curl.dev}"
"--with-pcre=${pcre.dev}" "--with-pcre=${pcre.dev}"
"--enable-milter" "--enable-milter"
"--disable-clamav"
]; ];
fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else "";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.clamav.net; homepage = http://www.clamav.net;
description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";