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".
This commit is contained in:
Spencer Baugh
2019-05-12 20:08:50 +02:00
committed by Frederik Rietdijk
parent 147621f7db
commit 4b8803dae6
12 changed files with 39 additions and 39 deletions
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, docutils, makeWrapper
, gnupg1compat, curl, rsync, coreutils
, gnupg, curl, rsync, coreutils
, gawk, gnused, gnugrep
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installPhase = ''
prefix="$out" ./install.sh
wrapProgram "$out/bin/git-remote-gcrypt" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync coreutils
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg curl rsync coreutils
gawk gnused gnugrep ]}"
'';