* Synced with trunk @ 15346

svn path=/nixos/branches/modular-nixos/; revision=15373

upstart-jobs/xserver/default.nix

@@ -315,7 +315,7 @@ let
       xorg.xf86inputevdev
     ] 
     ++ getAttr ["modules"] [] videoDriverModules
-    ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
+    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
 
 
   fontsForXServer =
@@ -560,7 +560,7 @@ mkIf cfg.enable {
         }
 
         ${if videoDriver != "nvidia"
-          then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
+          then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
           else ""
         }
 

upstart-jobs/xserver/xserver.conf

@@ -74,6 +74,7 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
+  Option       "AutoAddDevices" "0"
 EndSection