Added option tcpEnable for X server. Needed for xmove.
svn path=/nixos/trunk/; revision=9532
This commit is contained in:
parent
fc31c8c9b5
commit
0ff3fc1882
@ -586,7 +586,14 @@
|
||||
";
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
name = ["services" "xserver" "tcpEnable"];
|
||||
default = false;
|
||||
description = "
|
||||
Whether to enable TCP socket for the X server.
|
||||
";
|
||||
}
|
||||
|
||||
{
|
||||
name = ["services" "xserver" "resolutions"];
|
||||
default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
|
||||
|
@ -286,13 +286,13 @@ let
|
||||
"-ac"
|
||||
"-logverbose"
|
||||
"-verbose"
|
||||
"-nolisten tcp"
|
||||
"-terminate"
|
||||
"-logfile" "/var/log/X.${toString display}.log"
|
||||
"-config ${configFile}"
|
||||
":${toString display}" "vt${toString tty}"
|
||||
"-xkbdir" "${xkeyboard_config}/etc/X11/xkb"
|
||||
];
|
||||
] ++ (if ! config.get ["services" "xserver" "tcpEnable"]
|
||||
then ["-nolisten tcp"] else []);
|
||||
|
||||
|
||||
# Note: lines must not be indented.
|
||||
|
Loading…
x
Reference in New Issue
Block a user