2006-12-10 23:29:44 +01:00
|
|
|
{ substituteAll
|
2006-11-28 23:27:56 +01:00
|
|
|
|
|
|
|
, xorgserver
|
|
|
|
|
|
|
|
, xf86inputkeyboard
|
|
|
|
|
|
|
|
, xf86inputmouse
|
|
|
|
|
|
|
|
, xf86videovesa
|
|
|
|
|
|
|
|
, # Virtual console for the X server.
|
|
|
|
tty ? 7
|
|
|
|
|
|
|
|
, # X display number.
|
|
|
|
display ? 0
|
|
|
|
|
|
|
|
}:
|
|
|
|
|
|
|
|
let
|
|
|
|
|
2006-12-10 23:29:44 +01:00
|
|
|
config = substituteAll {
|
2006-11-28 23:27:56 +01:00
|
|
|
name = "xserver.conf";
|
|
|
|
src = ./xserver.conf;
|
|
|
|
};
|
|
|
|
|
|
|
|
in
|
|
|
|
|
|
|
|
rec {
|
|
|
|
name = "xserver";
|
|
|
|
|
|
|
|
job = "
|
2006-11-29 23:34:59 +01:00
|
|
|
#start on network-interfaces
|
2006-11-28 23:27:56 +01:00
|
|
|
|
|
|
|
start script
|
|
|
|
|
|
|
|
end script
|
|
|
|
|
|
|
|
# !!! -ac is a bad idea.
|
|
|
|
exec ${xorgserver}/bin/X \\
|
|
|
|
-ac -nolisten tcp -terminate \\
|
|
|
|
-logfile /var/log/X.${toString display}.log \\
|
|
|
|
-fp /var/fonts \\
|
|
|
|
-modulepath ${xorgserver}/lib/xorg/modules,${xf86inputkeyboard}/lib/xorg/modules/input,${xf86inputmouse}/lib/xorg/modules/input,${xf86videovesa}/lib/xorg/modules/drivers \\
|
|
|
|
-config ${config} \\
|
|
|
|
:${toString display} vt${toString tty}
|
|
|
|
|
|
|
|
";
|
|
|
|
|
|
|
|
}
|