From fa9ceac86273f7fec7deb480b18de6e0efc1cd2c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:51:58 +0000
Subject: [PATCH] * Synced with trunk @ 15346

svn path=/nixos/branches/modular-nixos/; revision=15373
---
 upstart-jobs/xserver/default.nix  | 4 ++--
 upstart-jobs/xserver/xserver.conf | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index a02e559ade4..71eb34f34b6 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/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 ""
         }
 
diff --git a/upstart-jobs/xserver/xserver.conf b/upstart-jobs/xserver/xserver.conf
index a1d8aaea9b2..5d62ca9e397 100644
--- a/upstart-jobs/xserver/xserver.conf
+++ b/upstart-jobs/xserver/xserver.conf
@@ -74,6 +74,7 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
+  Option       "AutoAddDevices" "0"
 EndSection