public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-bc change

Browse Source 
svn path=/nixos/trunk/; revision=21326
This commit is contained in:
Yury G. Kudryashov 2010-04-26 15:57:06 +00:00
parent 69697a35bb
commit ce15e270f2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/services/x11/display-managers/default.nix
View File

@ -43,7 +43,7 @@ let
${optionalString cfg.startGnuPGAgent '' ${optionalString cfg.startGnuPGAgent ''
if test -z "$SSH_AUTH_SOCK"; then if test -z "$SSH_AUTH_SOCK"; then
# Restart this script as a child of the GnuPG agent. # Restart this script as a child of the GnuPG agent.
exec "${pkgs.gnupg2}/bin/gpg-agent" \ exec "${if pkgs ? gnupg2 then pkgs.gnupg2 else pkgs.gnupg}/bin/gpg-agent" \
--enable-ssh-support --daemon \ --enable-ssh-support --daemon \
--pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \ --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \
--write-env-file "$HOME/.gpg-agent-info" \ --write-env-file "$HOME/.gpg-agent-info" \