From 03b9664e25cdde7e3df427017e68f5f88c06c13f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 8 Aug 2011 01:20:29 +0000 Subject: [PATCH] Add xf86-input-multitouch svn path=/nixpkgs/trunk/; revision=28369 --- .../linux/xf86-input-multitouch/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/os-specific/linux/xf86-input-multitouch/default.nix diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix new file mode 100644 index 00000000000..170fd28fbf6 --- /dev/null +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchgit +, mtdev +, xorgserver +, xproto +, pixman +, xextproto +, inputproto +, randrproto +, libpciaccess +}: + +stdenv.mkDerivation { + name = "xf86-input-multitouch-20110312"; + + src = fetchgit { + url = http://bitmath.org/git/multitouch.git; + rev = "4d87c041f6a232aa30528d70d4b9946d1824b4ed"; + sha256 = "de705e34bc75654139dfcbedfe43a3d182d140b198fcd57ab190d549471305ca"; + }; + + confFile = '' + Section "InputClass" + MatchIsTouchpad "true" + Identifier "Multitouch Touchpad" + Driver "multitouch" + EndSection + ''; + + buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ]; + + buildPhase = '' + make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" + ''; + + installPhase = '' + make DESTDIR="$out" LIBDIR="lib" install + ensureDir $out/include/xorg + echo -n "$confFile" > $out/include/xorg/10-multitouch.conf + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93620252987..5367bb14c24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5865,6 +5865,9 @@ let wpa_supplicant_gui = pkgs.wpa_supplicant.gui; + xf86_input_multitouch = + callPackage ../os-specific/linux/xf86-input-multitouch { }; + xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; xmoto = builderDefsPackage (import ../games/xmoto) {