From ea557c8fd18bd721f4e8017c0da2020e92c251e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 29 Nov 2014 11:19:00 +0100
Subject: [PATCH] xorg xf86-input-evdev: update and add needed inputs
---
pkgs/servers/x11/xorg/default.nix | 6 +++---
pkgs/servers/x11/xorg/overrides.nix | 1 +
pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ec56ce185b9..8e4566d906d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1375,11 +1375,11 @@ let
}) // {inherit ;};
xf86inputevdev = (mkDerivation "xf86inputevdev" {
- name = "xf86-input-evdev-2.8.4";
+ name = "xf86-input-evdev-2.9.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2;
- sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5";
+ url = mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2;
+ sha256 = "1y82hpx86rngb0yrvcl4ni88wkc3zf9dj25myjk91b7ymll07qqc";
};
buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
}) // {inherit inputproto udev xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2fa9a7fddc5..a95d8818651 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -173,6 +173,7 @@ in
xf86inputevdev = attrs: attrs // {
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
installFlags = "sdkdir=\${out}/include/xorg";
+ buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ];
};
xf86inputmouse = attrs: attrs // {
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index fb5f444a695..74688017152 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -115,7 +115,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2