Author: shlevy
Date: Mon Aug 8 01:20:29 2011
New Revision: 28369
URL: https://svn.nixos.org/websvn/nix/?rev=28369&sc=1
Log:
Add xf86-input-multitouch
Added:
nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-multitouch/
nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
Mon Aug 8 01:20:29 2011 (r28369)
@@ -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
+ '';
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 8 00:25:54
2011 (r28368)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 8 01:20:29
2011 (r28369)
@@ -5865,6 +5865,9 @@
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) {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
