Update LinuxWacom driver

svn path=/nixpkgs/trunk/; revision=16565

pkgs/misc/linuxwacom/default.nix

@@ -1,14 +1,25 @@
-{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;
+    url = "http://prdownloads.sourceforge.net/linuxwacom/linuxwacom-0.8.4.tar.bz2";
-    md5 = "3f6290101d5712a24097243ca9f092ed";
+    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
@@ -16,4 +27,10 @@ stdenv.mkDerivation {
       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;
+  };
 }

pkgs/top-level/all-packages.nix

@@ -7802,8 +7802,9 @@ let
   };
 
   linuxwacom = import ../misc/linuxwacom {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv ncurses pkgconfig;
-    inherit (xlibs) libX11 libXi;
+    inherit (xorg) libX11 libXi xproto inputproto
+      xorgserver;
   };
 
   martyr = import ../development/libraries/martyr {

pkgs/top-level/release.nix

@@ -218,6 +218,7 @@ in {
   libtopology = all;
   libxml2 = all;
   libxslt = all;
+  linuxwacom = linux;
   lout = linux;
   lsh = linux;
   lsof = linux;