From caede3beb511b03a5d927c2120393a987a728244 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Aug 2009 14:15:22 +0000
Subject: [PATCH] Update LinuxWacom driver

svn path=/nixpkgs/trunk/; revision=16565
---
 pkgs/misc/linuxwacom/default.nix | 27 ++++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix  |  5 +++--
 pkgs/top-level/release.nix       |  1 +
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/linuxwacom/default.nix b/pkgs/misc/linuxwacom/default.nix
index 8b1c2ced55b..5eb55496c4d 100644
--- a/pkgs/misc/linuxwacom/default.nix
+++ b/pkgs/misc/linuxwacom/default.nix
@@ -1,19 +1,36 @@
-{stdenv, fetchurl, libX11, libXi, udevSupport ? false}:
+{stdenv, fetchurl, libX11, libXi, 
+  inputproto, xproto, ncurses, pkgconfig,
+  xorgserver,
+  udevSupport ? false}:
 
 stdenv.mkDerivation {
-  name = "linuxwacom-0.7.2";
+  name = "linuxwacom-0.8.4";
   
   src = fetchurl {
-    url = http://nixos.org/tarballs/linuxwacom-0.7.2.tar.bz2;
-    md5 = "3f6290101d5712a24097243ca9f092ed";
+    url = "http://prdownloads.sourceforge.net/linuxwacom/linuxwacom-0.8.4.tar.bz2";
+    sha256 = "1g1myn9wmczavkkb9jjfqq87la3n94nnwjm7w7yyyxsrdw4bavp5";
   };
   
-  buildInputs = [libX11 libXi];
+  buildInputs = [libX11 libXi inputproto 
+    xproto ncurses pkgconfig xorgserver];
   
+  preConfigure = ''
+    ./configure --enable-wacomdrv --prefix=$out \
+      --with-xlib --with-xorg-sdk --enable-wacdump --enable-xsetwacom \
+      --with-xmoduledir=$out/lib/xorg/modules/input
+    mv configure configure.removed
+  '';
+
   postInstall = ''
     if test -n "${toString udevSupport}"; then
       ensureDir $out/etc/udev/rules.d
       cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules
     fi
   '';
+
+  meta = {
+    maintainers = [stdenv.lib.maintainers.raskin];
+    description = "Wacom digitizer driver for X11";
+    homepage = http://linuxwacom.sf.net;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fab64ab84c..a8c92f44dd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7802,8 +7802,9 @@ let
   };
 
   linuxwacom = import ../misc/linuxwacom {
-    inherit fetchurl stdenv;
-    inherit (xlibs) libX11 libXi;
+    inherit fetchurl stdenv ncurses pkgconfig;
+    inherit (xorg) libX11 libXi xproto inputproto
+      xorgserver;
   };
 
   martyr = import ../development/libraries/martyr {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 4b069ac0097..1270c048b05 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -218,6 +218,7 @@ in {
   libtopology = all;
   libxml2 = all;
   libxslt = all;
+  linuxwacom = linux;
   lout = linux;
   lsh = linux;
   lsof = linux;