nixos/gnupg: set SSH_AUTH_SOCK in non-interactive settings

`SSH_AUTH_SOCK` is useful in some non-interactive settings, for instance daemonized Emacs. Fixes NixOS#55733.
shosti · Feb 23, 2019 · ddabdc0 · ddabdc0
1 parent bea06ac
commit ddabdc0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
@@ -85,11 +85,13 @@ in
       # SSH agent protocol doesn't support changing TTYs, so bind the agent
       # to every new TTY.
       ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null
+    '');
 
+    environment.extraInit = mkIf cfg.agent.enableSSHSupport ''
       if [ -z "$SSH_AUTH_SOCK" ]; then
         export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)
       fi
-    '');
+    '';
 
     assertions = [
       { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent;