MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #207887 from MrcJkb/fix-gpg-module-for-nushell

Browse source 
nixos/gnupg: (fix) use runtimeShell to call updatestartuptty
This commit is contained in:
Michele Guerini Rocco 2023-01-03 18:20:05 +01:00 committed by GitHub
commit 4b87e3b61d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/programs/gnupg.nix
View file

@ -135,7 +135,7 @@ in
# The SSH agent protocol doesn't have support for changing TTYs; however we # The SSH agent protocol doesn't have support for changing TTYs; however we
# can simulate this with the `exec` feature of openssh (see ssh_config(5)) # can simulate this with the `exec` feature of openssh (see ssh_config(5))
# that hooks a command to the shell currently running the ssh program. # that hooks a command to the shell currently running the ssh program.
Match host * exec "${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1" Match host * exec "${pkgs.runtimeShell} -c '${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1'"
''; '';
environment.extraInit = mkIf cfg.agent.enableSSHSupport '' environment.extraInit = mkIf cfg.agent.enableSSHSupport ''