Merge #12357: nixos docs: show references to packages

2016-02-03 10:07:27 +01:00
parent 7fa9a1abce 3bcf8ae879
commit b2a37ceeea
11 changed files with 37 additions and 27 deletions
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -36,6 +36,7 @@ in

      askPassword = mkOption {
        type = types.str;
+        default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
        description = ''Program used by SSH to ask for passwords.'';
      };

@@ -226,7 +227,5 @@ in

    environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;

-    programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
-
  };
 }