From 62bcea0382e6e5ab7733f911fb3093723496de7c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Apr 2010 21:03:43 +0000
Subject: [PATCH] Remove linuxwacom: it is not compatible with new xserver

svn path=/nixpkgs/trunk/; revision=21016
---
 pkgs/misc/linuxwacom/0.8.4.x.nix    |  5 -----
 pkgs/misc/linuxwacom/0.8.5.x.nix    |  5 -----
 pkgs/misc/linuxwacom/10-wacom.rules |  3 ---
 pkgs/misc/linuxwacom/wacom.nix      | 32 -----------------------------
 pkgs/top-level/all-packages.nix     | 12 -----------
 pkgs/top-level/release.nix          |  1 -
 6 files changed, 58 deletions(-)
 delete mode 100644 pkgs/misc/linuxwacom/0.8.4.x.nix
 delete mode 100644 pkgs/misc/linuxwacom/0.8.5.x.nix
 delete mode 100644 pkgs/misc/linuxwacom/10-wacom.rules
 delete mode 100644 pkgs/misc/linuxwacom/wacom.nix

diff --git a/pkgs/misc/linuxwacom/0.8.4.x.nix b/pkgs/misc/linuxwacom/0.8.4.x.nix
deleted file mode 100644
index a8bd129664ec..000000000000
--- a/pkgs/misc/linuxwacom/0.8.4.x.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-args: (import ./wacom.nix) (args //
-{
-  version = "0.8.4-4";
-  hash = "1cydd8906y923llxf9s1fvzb26dbcfvzlgasmlqpa75p98fnnrpz";
-})
diff --git a/pkgs/misc/linuxwacom/0.8.5.x.nix b/pkgs/misc/linuxwacom/0.8.5.x.nix
deleted file mode 100644
index 89114bbc75d4..000000000000
--- a/pkgs/misc/linuxwacom/0.8.5.x.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-args: (import ./wacom.nix) (args //
-{
-  version = "0.8.5-12";
-  hash = "0i4dx3gh7f56id5ca60l9s3ypxnwn6gg4w9a6jzkbgzbipknn71k";
-})
diff --git a/pkgs/misc/linuxwacom/10-wacom.rules b/pkgs/misc/linuxwacom/10-wacom.rules
deleted file mode 100644
index ac7632a776d0..000000000000
--- a/pkgs/misc/linuxwacom/10-wacom.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# udev rule to create /dev/input/wacomN for wacom tablets
-
-KERNEL="event*", SYSFS{manufacturer}="WACOM", NAME="input/%k", SYMLINK="input/wacom%e"
diff --git a/pkgs/misc/linuxwacom/wacom.nix b/pkgs/misc/linuxwacom/wacom.nix
deleted file mode 100644
index 9493bc832bc0..000000000000
--- a/pkgs/misc/linuxwacom/wacom.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, libX11, libXi, inputproto
-, xproto, ncurses, pkgconfig, xorgserver, version, hash }:
-
-stdenv.mkDerivation rec {
-  name = "linuxwacom-${version}";
-  
-  src = fetchurl {
-    url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = hash;
-  };
-  
-  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 =
-    ''
-      ensureDir $out/etc/udev/rules.d
-      cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules
-    '';
-
-  meta = {
-    maintainers = with stdenv.lib.maintainers; [raskin urkud];
-    description = "Wacom digitizer driver for X11";
-    homepage = http://linuxwacom.sourceforge.net;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82232107832e..de1cbf123241 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9066,18 +9066,6 @@ let
     flex = flex2535;
   };
 
-  linuxwacom = linuxwacom_0_8_5;
-
-  linuxwacom_0_8_5 = import ../misc/linuxwacom/0.8.5.x.nix {
-    inherit fetchurl stdenv ncurses pkgconfig;
-    inherit (xorg) libX11 libXi xproto inputproto xorgserver;
-  };
-
-  linuxwacom_0_8_4 = import ../misc/linuxwacom/0.8.4.x.nix {
-    inherit fetchurl stdenv ncurses pkgconfig;
-    inherit (xorg) libX11 libXi xproto inputproto xorgserver;
-  };
-
   martyr = import ../development/libraries/martyr {
     inherit stdenv fetchurl apacheAnt;
   };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f9c612a42f3d..a320c5a4bc2b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -173,7 +173,6 @@ with (import ./release-lib.nix);
   libtool_2 = all;
   libxml2 = all;
   libxslt = all;
-  linuxwacom = linux;
   lout = linux;
   lsh = linux;
   lsof = linux;