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

Added option tcpEnable for X server. Needed for xmove.

Browse Source 
svn path=/nixos/trunk/; revision=9532
This commit is contained in:
Michael Raskin 2007-10-26 05:52:35 +00:00
parent fc31c8c9b5
commit 0ff3fc1882
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/options.nix
View File

@ -586,7 +586,14 @@
"; ";
} }
{
name = ["services" "xserver" "tcpEnable"];
default = false;
description = "
Whether to enable TCP socket for the X server.
";
}
{ {
name = ["services" "xserver" "resolutions"]; name = ["services" "xserver" "resolutions"];
default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}]; default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];

4
upstart-jobs/xserver.nix
View File

@ -286,13 +286,13 @@ let
"-ac" "-ac"
"-logverbose" "-logverbose"
"-verbose" "-verbose"
"-nolisten tcp"
"-terminate" "-terminate"
"-logfile" "/var/log/X.${toString display}.log" "-logfile" "/var/log/X.${toString display}.log"
"-config ${configFile}" "-config ${configFile}"
":${toString display}" "vt${toString tty}" ":${toString display}" "vt${toString tty}"
"-xkbdir" "${xkeyboard_config}/etc/X11/xkb" "-xkbdir" "${xkeyboard_config}/etc/X11/xkb"
]; ] ++ (if ! config.get ["services" "xserver" "tcpEnable"]
then ["-nolisten tcp"] else []);
# Note: lines must not be indented. # Note: lines must not be indented.