From 6ba53ec09a253b45757915e0f47fd6fd13f1e420 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Feb 2011 15:54:57 +0000
Subject: [PATCH] * Fix xf86-input-synaptics and xf86-input-keyboard. * Enable
 parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
---
 pkgs/servers/x11/xorg/builder.sh    | 7 +++++--
 pkgs/servers/x11/xorg/overrides.nix | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 528042e3df9..c33d1806fd6 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -38,12 +38,15 @@ postInstall() {
 }
 
 
-installFlags="appdefaultdir=$out/share/X11/app-defaults"
+installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags"
 
 
 if test -n "$x11BuildHook"; then
     source $x11BuildHook
-fi   
+fi
+
+
+enableParallelBuilding=1
 
 
 genericBuild
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0ef2bf5f859..f1b0f64f02e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -113,13 +113,13 @@ in
   };
 
   xf86inputevdev = attrs: attrs // {
-    configureFlags = "--with-sdkdir=\${out}/include/xorg";
     preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
     buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto];
+    installFlags = "sdkdir=\${out}/include/xorg";
   };
 
   xf86inputsynaptics = attrs: attrs // {
-    makeFlags = "sdkdir=\${out}/include/xorg";
+    installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
   };
 
   xf86videointel = attrs: attrs // {
@@ -166,7 +166,7 @@ in
       ];
     propagatedBuildInputs =
       [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
-        xorg.dri2proto
+        xorg.dri2proto xorg.kbproto
       ];
     postInstall =
       ''