diff options
Diffstat (limited to 'pkgs/servers/mail/spamassassin/default.nix')
-rw-r--r-- | pkgs/servers/mail/spamassassin/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index d32957210132..c3fcd13a41f8 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile -, HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1 -}: +{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg1 }: perlPackages.buildPerlPackage rec { name = "SpamAssassin-3.4.1"; @@ -13,12 +11,12 @@ perlPackages.buildPerlPackage rec { # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434 patches = [ ./sa-update_add--siteconfigpath.patch ]; - buildInputs = with perlPackages; [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM - LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable ]; + buildInputs = [ makeWrapper ] ++ (with perlPackages; [ HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM + LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable ]); # Enabling 'taint' mode is desirable, but that flag disables support # for the PERL5LIB environment variable. Needs further investigation. - makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no"; + makeFlags = "PERL_BIN=${perlPackages.perl}/bin/perl PERL_TAINT=no"; makeMakerFlags = "CONFDIR=/homeless/shelter LOCALSTATEDIR=/var/lib/spamassassin"; |