summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com>2023-01-04 10:41:09 +0100
committerGitHub <noreply@github.com>2023-01-04 10:41:09 +0100
commit07f825c1ed0e817355805ddef8beadf0fb1fbb8d (patch)
treea3c0e2806eb43716c2898e25b670eb6e6bbcf8d0
parentMerge pull request #208934 from NixOS/backport-208530-to-release-22.11 (diff)
parentnixos/gnupg: (fix) use runtimeShell to call updatestartuptty (diff)
downloadnixpkgs-07f825c1ed0e817355805ddef8beadf0fb1fbb8d.tar.gz
Merge pull request #208904 from NixOS/backport-207887-to-release-22.11
[Backport release-22.11] nixos/gnupg: (fix) use runtimeShell to call updatestartuptty
-rw-r--r--nixos/modules/programs/gnupg.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 828f24f99111..cb8d0ecff4cb 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -135,7 +135,7 @@ in
# 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))
# 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 ''