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

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

View File

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