about summary refs log tree commit diff
path: root/pkgs/servers/mail/spamassassin
diff options
context:
space:
mode:
authorSpencer Baugh <sbaugh@catern.com>2019-03-20 18:23:30 +0000
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-05-12 20:08:50 +0200
commit4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f (patch)
treeed1f58c306c4581feab999cfa289c97a3755fde1 /pkgs/servers/mail/spamassassin
parent147621f7db67344b781c6626b88ff6d0bad7aa70 (diff)
switch users of "gnupg1" to plain "gnupg"
gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".
Diffstat (limited to 'pkgs/servers/mail/spamassassin')
-rw-r--r--pkgs/servers/mail/spamassassin/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index 094b782abf9e8..e95fcaa03ef19 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg1 }:
+{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg }:
 
 perlPackages.buildPerlPackage rec {
   name = "SpamAssassin-3.4.2";
@@ -27,7 +27,7 @@ perlPackages.buildPerlPackage rec {
     mv "rules/"* $out/share/spamassassin/
 
     for n in "$out/bin/"*; do
-      wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg1}/bin"
+      wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg}/bin"
     done
   '';