Merge branch 'master.xauth' of git://github.com/wkennington/nixpkgs

ssh: Don't set xuth if not running xserver
This commit is contained in:
Shea Levy 2014-04-05 15:32:31 -04:00
commit ad4965f54c

View file

@ -31,7 +31,7 @@ in
setXAuthLocation = mkOption {
type = types.bool;
default = true;
default = config.services.xserver.enable;
description = ''
Whether to set the path to <command>xauth</command> for X11-forwarded connections.
This causes a dependency on X11 packages.