From c4ad7b56d11f71a3a089951df88ca453d141a563 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 9 Nov 2007 13:55:07 +0000
Subject: [PATCH] Added a silent mention of evdev in xorg.conf, but removed
 actual dependency on it.

svn path=/nixos/trunk/; revision=9614
---
 upstart-jobs/xserver.conf | 1 +
 upstart-jobs/xserver.nix  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index dba567a9e7e..80d265ff5b4 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -19,6 +19,7 @@ Section "Module"
   Load "int10"
   Load "type1"
   Load "vbe"
+  #Load "evdev"
   @moduleSection@
 	@extraModules@
 EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index bec803296ec..aa82cb1e0a4 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -68,7 +68,7 @@ let
     ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel
-    ++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) xorg.xf86inputevdev]);
+    ++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
     
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";