Added a silent mention of evdev in xorg.conf, but removed actual dependency on it.

svn path=/nixos/trunk/; revision=9614
This commit is contained in:
Michael Raskin 2007-11-09 13:55:07 +00:00
parent 5bb4e343b4
commit c4ad7b56d1
2 changed files with 2 additions and 1 deletions

View File

@ -19,6 +19,7 @@ Section "Module"
Load "int10" Load "int10"
Load "type1" Load "type1"
Load "vbe" Load "vbe"
#Load "evdev"
@moduleSection@ @moduleSection@
@extraModules@ @extraModules@
EndSection EndSection

View File

@ -68,7 +68,7 @@ let
++ optional (videoDriver == "sis") xorg.xf86videosis ++ optional (videoDriver == "sis") xorg.xf86videosis
++ optional (videoDriver == "i810") xorg.xf86videoi810 ++ optional (videoDriver == "i810") xorg.xf86videoi810
++ optional (videoDriver == "intel") xorg.xf86videointel ++ optional (videoDriver == "intel") xorg.xf86videointel
++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) xorg.xf86inputevdev]); ++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
configFile = stdenv.mkDerivation { configFile = stdenv.mkDerivation {
name = "xserver.conf"; name = "xserver.conf";