From 5e7c026c22070e1a2a7206e792abc6deb3582683 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 13 Feb 2011 04:34:37 +0000
Subject: [PATCH] kde-x.y/utils is for kdeutils-x.y.z, not for apps from
 kde-apps.org

svn path=/nixpkgs/trunk/; revision=25932
---
 .../misc/kde-wacomtablet/default.nix}                  | 10 +++++-----
 pkgs/desktops/kde-4.5/default.nix                      |  1 -
 pkgs/top-level/all-packages.nix                        |  2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/kde-4.5/utils/wacomtablet.nix => applications/misc/kde-wacomtablet/default.nix} (68%)

diff --git a/pkgs/desktops/kde-4.5/utils/wacomtablet.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix
similarity index 68%
rename from pkgs/desktops/kde-4.5/utils/wacomtablet.nix
rename to pkgs/applications/misc/kde-wacomtablet/default.nix
index b9545a7b0ed..6da0b8410a0 100644
--- a/pkgs/desktops/kde-4.5/utils/wacomtablet.nix
+++ b/pkgs/applications/misc/kde-wacomtablet/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, automoc4, cmake, kdelibs, qt4 }:
+{ stdenv, fetchurl, automoc4, cmake, kdelibs }:
 
 stdenv.mkDerivation rec {
-  name = "wacomtablet";
-  version = "1.2.5";
+  name = "wacomtablet-1.2.5";
 
   src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-${name}-${version}.tar.gz";
+    url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz";
     sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
   };
 
-  buildInputs = [ automoc4 cmake kdelibs qt4 ];
+  buildInputs = [ automoc4 cmake kdelibs ];
 
   meta = with stdenv.lib; {
     description = "KDE Wacom graphic tablet configuration tool";
     license = "GPLv2";
     homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
     platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu maintainers.urkud ];
   };
 }
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 7beaf800999..fc8cab37aef 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -140,7 +140,6 @@ recurseIntoAttrs rec {
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
-    wacomtablet = callPackage ./utils/wacomtablet.nix { };
   };
 
   kdewebdev = combinePkgs "kdewebdev" {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a33048b1dd..ab78642b186 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6193,6 +6193,8 @@ let
 
   kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
 
+  kde_wacomtablet = newScope pkgs.kde4 ../applications/misc/kde-wacomtablet { };
+
   kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { };
 
   kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { };