public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12590 from exi/askpass-in-env

Browse Source 
nixos-ssh: set SSH_ASKPASS globally and not just on interactive shells
This commit is contained in:
Franz Pletz 2016-01-25 10:42:31 +01:00
commit ff51021920
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/programs/ssh.nix
View File

@ -221,10 +221,7 @@ in
fi fi
''; '';
environment.interactiveShellInit = optionalString config.services.xserver.enable environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
''
export SSH_ASKPASS=${askPassword}
'';
programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";