gnupg2 is now called gnupg
svn path=/nixos/trunk/; revision=21889
This commit is contained in:
parent
12e43068cf
commit
2dfd9b51ae
@ -24,7 +24,7 @@
|
||||
fuse ntfs3g smbfsFuse sshfsFuse
|
||||
manpages irssi elinks mcabber mutt openssh lftp
|
||||
openssl ncat socat
|
||||
gnupg gnupg2
|
||||
gnupg1 gnupg
|
||||
patch which diffutils gcc binutils bc file
|
||||
screen
|
||||
bvi joe nvi
|
||||
|
@ -43,7 +43,7 @@ let
|
||||
${optionalString cfg.startGnuPGAgent ''
|
||||
if test -z "$SSH_AUTH_SOCK"; then
|
||||
# Restart this script as a child of the GnuPG agent.
|
||||
exec "${if pkgs ? gnupg2 then pkgs.gnupg2 else pkgs.gnupg}/bin/gpg-agent" \
|
||||
exec "${pkgs.gnupg}/bin/gpg-agent" \
|
||||
--enable-ssh-support --daemon \
|
||||
--pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \
|
||||
--write-env-file "$HOME/.gpg-agent-info" \
|
||||
|
Loading…
Reference in New Issue
Block a user