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

* Fix the xserver job on non-nvidia cards.

Browse Source 
svn path=/nixos/trunk/; revision=8800
This commit is contained in:
Eelco Dolstra 2007-05-29 19:53:03 +00:00
parent f8d77aa58e
commit c76fa154a6
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
upstart-jobs/xserver.nix
View File

@ -52,16 +52,17 @@ let
modules =
optional (videoDriver == "nvidia") nvidiaDrivers ++ #make sure it first loads the nvidia libs
[
xorg.xorgserver
xorg.xf86inputkeyboard
xorg.xf86inputmouse
]
++ optional (videoDriver == "vesa") xorg.xf86videovesa
++ optional (videoDriver == "i810") xorg.xf86videoi810
++ optional (videoDriver == "intel") xorg.xf86videointel;
optional (videoDriver == "nvidia") nvidiaDrivers ++ #make sure it first loads the nvidia libs
[
xorg.xorgserver
xorg.xf86inputkeyboard
xorg.xf86inputmouse
]
++ optional (videoDriver == "vesa") xorg.xf86videovesa
++ optional (videoDriver == "i810") xorg.xf86videoi810
++ optional (videoDriver == "intel") xorg.xf86videointel;
configFile = stdenv.mkDerivation {
name = "xserver.conf";
src = ./xserver.conf;
@ -99,6 +100,12 @@ let
Option \\\"AddARGBGLXVisuals\\\" \\\"true\\\" \\n \"
export extensions=\"Option \\\"Composite\\\" \\\"Enable\\\" \\n \"
else
export moduleSection='Load \"glx\" \\n \\
Load \"dri\" '
export screen=
export device=
export extensions=
fi
substituteAll $src $out