Skip to content

Commit

Permalink
clamav: don't bundle freshclam config with package
Browse files Browse the repository at this point in the history
Building clamav is expensive due to the bundled llvm.

Closes #20304.
  • Loading branch information
fpletz committed Nov 15, 2016
1 parent 999ac30 commit 02e9c88
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion nixos/modules/services/security/clamav.nix
Expand Up @@ -16,7 +16,7 @@ let
${cfg.daemon.extraConfig}
'';
pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; };
pkg = pkgs.clamav;
in
{
options = {
Expand Down
9 changes: 4 additions & 5 deletions pkgs/tools/security/clamav/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
, libmilter, pcre, freshclamConf ? null }:
, libmilter, pcre }:

stdenv.mkDerivation rec {
name = "clamav-${version}";
Expand All @@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn";
};

buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ];
buildInputs = [
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
];

configureFlags = [
"--with-zlib=${zlib.dev}"
Expand All @@ -22,11 +24,8 @@ stdenv.mkDerivation rec {
"--with-libcurl=${curl.dev}"
"--with-pcre=${pcre.dev}"
"--enable-milter"
"--disable-clamav"
];

fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else "";

meta = with stdenv.lib; {
homepage = http://www.clamav.net;
description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
Expand Down

0 comments on commit 02e9c88

Please sign in to comment.