Skip to content

Commit

Permalink
gpg: Suppress stderr from gpg-connect-agent on shell init
Browse files Browse the repository at this point in the history
In some scenarios, the command may fail, e.g. when the shell is executed
with a different $HOME from where gpg agent is configured to run from.

(E.g. this happens in kitty terminal test suite.)

This patch will suppress stderr errors on tty in this situation.

Note that zsh does not allow to suppress execution of /etc/zshenv on
startup, so it's impossible to skip it in the test suite environment.

An alternative would be to set IN_NIX_SHELL in the test suite, but this
was rejected in upstream:

kovidgoyal/kitty#7800

There's also a kitty package specific fix posted here but this may be
unnecessary once nix-darwin is patched here:

NixOS/nixpkgs#338070

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
  • Loading branch information
booxter committed Aug 29, 2024
1 parent ac5694a commit 75d14c6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/programs/gnupg.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ in
'' + (optionalString cfg.agent.enableSSHSupport ''
# 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
${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null 2>&1
export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)
'');
Expand Down

0 comments on commit 75d14c6

Please sign in to comment.