From 6fe5413cb7a4f9aef80ae76b3f2a299a75fafabb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 20 Mar 2012 01:48:09 +0000 Subject: [PATCH] xf86-input-multitouch seems to be abandoned, update it with the mtrack fork svn path=/nixpkgs/trunk/; revision=33283 --- pkgs/development/libraries/mtdev/default.nix | 8 ++-- .../linux/xf86-input-mtrack/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/xf86-input-mtrack/default.nix diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index b8ecdb239c1..854becf6bb5 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "mtdev-1.1.0"; +stdenv.mkDerivation rec { + name = "mtdev-1.1.2"; src = fetchurl { - url = "http://bitmath.org/code/mtdev/mtdev-1.1.0.tar.bz2"; - sha256 = "0l5a6vr5r5yx3g86nvj699xlpd5bg5rfzpgjvn46flq4x9r9zpac"; + url = "http://bitmath.org/code/mtdev/${name}.tar.bz2"; + sha256 = "0c2sfxxymf20ylvblgmdmybqs0cydmphg9fq6fnp6flbl0fd33b9"; }; meta = { diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix new file mode 100644 index 00000000000..f04d2d7f320 --- /dev/null +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -0,0 +1,37 @@ +{ + stdenv +, fetchurl +, autoconf +, automake +, utilmacros +, pkgconfig +, libtool +, mtdev +, xorgserver +, xproto +, inputproto +}: + +stdenv.mkDerivation { + name = "xf86-input-mtrack-0.2.0"; + + preConfigure = "autoreconf -vfi"; + + buildInputs = [ + autoconf + automake + utilmacros + pkgconfig + libtool + mtdev + xorgserver + xproto + inputproto + ]; + + src = fetchurl { + name = "xf86-input-mtrack.tar.gz"; + url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0"; + sha256 = "1zvd68dxpjn44ys7ysi3yc95xdjw1rz0s3xwlh3fzpw1ib3wrr3x"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83cb9c7eea3..9f8abfdb484 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6071,6 +6071,10 @@ let wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; + xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { + inherit (xorg) utilmacros xproto inputproto xorgserver; + }; + xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };