From ce15e270f2e712991447cb30fbe657ad8eb8dbb2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 26 Apr 2010 15:57:06 +0000 Subject: [PATCH] Fix non-bc change svn path=/nixos/trunk/; revision=21326 --- modules/services/x11/display-managers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix index acc724c8663..0cebbbf6be1 100644 --- a/modules/services/x11/display-managers/default.nix +++ b/modules/services/x11/display-managers/default.nix @@ -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 "${pkgs.gnupg2}/bin/gpg-agent" \ + exec "${if pkgs ? gnupg2 then pkgs.gnupg2 else pkgs.gnupg}/bin/gpg-agent" \ --enable-ssh-support --daemon \ --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \ --write-env-file "$HOME/.gpg-agent-info" \