From 5f9014cc7f0affe5b498df33b516802a2c953654 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Apr 2009 23:06:02 +0000
Subject: [PATCH] * Updated evdev to the latest version.  Otherwise, the arrow
 keys and   others break under KDE and Gnome unless you set the keyboard type
 to   evdev (e.g. in the KDE System Settings).  See

    http://wiki.archlinux.org/index.php/Xorg_input_hotplugging#Using_the_evdev_driver_kills_my_arrow_keys.2C_printscreen_is_triggered_instead

  TODO: update this in the X.org generator.

svn path=/nixpkgs/trunk/; revision=15343
---
 pkgs/servers/x11/xorg/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 66a16460e75b..617b9a136575 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1375,13 +1375,14 @@ rec {
   }) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputevdev = (stdenv.mkDerivation {
-    name = "xf86-input-evdev-2.0.4";
+    name = "xf86-input-evdev-2.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.4/src/everything/xf86-input-evdev-2.0.4.tar.bz2;
-      sha256 = "1jhmq1fl8dnrdqcbzrzq29gqjfxzcz7ivlhb3p5x942cmynxqnl2";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.2.1.tar.bz2  ;
+      sha256 = "19z27qikxc8dqxrfz3y6xiaf23hfaa1s79r0x0wvqjb2532bwmy3";
     };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
+    buildInputs = [pkgconfig inputproto kbproto libxkbfile randrproto xorgserver xproto ];
+    configureFlags = "--with-sdkdir=\${out}/include/xorg";
     preBuild = "
     sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
     ";