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

* X server: remove the udev hack.

Browse Source 
svn path=/nixos/branches/upstart-0.6/; revision=18358
This commit is contained in:
Eelco Dolstra 2009-11-15 20:38:19 +00:00
parent 9174b4ab42
commit 56d817b0b0
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/services/x11/xserver.nix
View File

@ -363,7 +363,7 @@ in
optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
jobs.xserver =
{ startOn = if cfg.autorun then "started hal" else "";
{ startOn = if cfg.autorun then "started udev and started hal" else "";
environment =
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
@ -379,14 +379,6 @@ in
preStart =
''
# Ugly hack: wait until udev has started since the X server
# needs various devices. This would more properly be
# expressed as an Upstart dependency, but AFAIK in "start
# on" we can't express a logical AND.
while ! initctl status udev 2>&1 | grep -q running; do
sleep 1
done
rm -f /var/run/opengl-driver
${# !!! The OpenGL driver depends on what's detected at runtime.
if elem "nvidia" driverNames then ''