Author: shlevy
Date: Tue Mar 20 01:48:09 2012
New Revision: 33283
URL: https://nixos.org/websvn/nix/?rev=33283&sc=1
Log:
xf86-input-multitouch seems to be abandoned, update it with the mtrack fork
Added:
nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-mtrack/
nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
Modified:
nixos/trunk/modules/services/x11/hardware/multitouch.nix
nixpkgs/trunk/pkgs/development/libraries/mtdev/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixos/trunk/modules/services/x11/hardware/multitouch.nix
==============================================================================
--- nixos/trunk/modules/services/x11/hardware/multitouch.nix Tue Mar 20
00:02:24 2012 (r33282)
+++ nixos/trunk/modules/services/x11/hardware/multitouch.nix Tue Mar 20
01:48:09 2012 (r33283)
@@ -26,9 +26,9 @@
''
# Automatically enable the multitouch driver
Section "InputClass"
- MatchIsTouchpad "true"
- Identifier "Multitouch Touchpad"
- Driver "multitouch"
+ MatchIsTouchpad "on"
+ Identifier "Touchpads"
+ Driver "mtrack"
EndSection
'';
Modified: nixpkgs/trunk/pkgs/development/libraries/mtdev/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/mtdev/default.nix Tue Mar 20
00:02:24 2012 (r33282)
+++ nixpkgs/trunk/pkgs/development/libraries/mtdev/default.nix Tue Mar 20
01:48:09 2012 (r33283)
@@ -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 = {
Added: nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-mtrack/default.nix Tue Mar
20 01:48:09 2012 (r33283)
@@ -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";
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 00:02:24
2012 (r33282)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 01:48:09
2012 (r33283)
@@ -6071,6 +6071,10 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
