* Fix the xserver job on non-nvidia cards.

svn path=/nixos/trunk/; revision=8800
2007-05-29 19:53:03 +00:00 · 2007-05-29 19:53:03 +00:00 · c76fa154a6
parent f8d77aa58e
commit c76fa154a6
1 changed files with 16 additions and 9 deletions
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@ -62,6 +62,7 @@ let
    ++ 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