From 6b8a528f49b0c924f48f5ffb96dae58cf0786c9e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 15 Nov 2016 02:02:25 +0100
Subject: [PATCH] clamav: don't bundle freshclam config with package

Building clamav is expensive due to the bundled llvm.

Closes #20304.

(cherry picked from commit 02e9c88d778b06909d4ef5a2e7e417aaeecb89a7)
---
 nixos/modules/services/security/clamav.nix | 2 +-
 pkgs/tools/security/clamav/default.nix     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index e4e5c1253b7743..89ac1c01f52178 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -16,7 +16,7 @@ let
 
     ${cfg.daemon.extraConfig}
   '';
-  pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; };
+  pkg = pkgs.clamav;
 in
 {
   options = {
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 0cb34b2e73c921..7473f056ce97cd 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/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}";
@@ -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}"
@@ -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";