kde-x.y/utils is for kdeutils-x.y.z, not for apps from kde-apps.org

svn path=/nixpkgs/trunk/; revision=25932
This commit is contained in:
Yury G. Kudryashov 2011-02-13 04:34:37 +00:00
parent 4b603776af
commit 5e7c026c22
3 changed files with 7 additions and 6 deletions

View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, automoc4, cmake, kdelibs, qt4 }: { stdenv, fetchurl, automoc4, cmake, kdelibs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wacomtablet"; name = "wacomtablet-1.2.5";
version = "1.2.5";
src = fetchurl { 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"; sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
}; };
buildInputs = [ automoc4 cmake kdelibs qt4 ]; buildInputs = [ automoc4 cmake kdelibs ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "KDE Wacom graphic tablet configuration tool"; description = "KDE Wacom graphic tablet configuration tool";
license = "GPLv2"; license = "GPLv2";
homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856; homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.goibhniu maintainers.urkud ];
}; };
} }

View File

@ -140,7 +140,6 @@ recurseIntoAttrs rec {
printer_applet = callPackage ./utils/printer-applet.nix { }; printer_applet = callPackage ./utils/printer-applet.nix { };
superkaramba = callPackage ./utils/superkaramba.nix { }; superkaramba = callPackage ./utils/superkaramba.nix { };
sweeper = callPackage ./utils/sweeper.nix { }; sweeper = callPackage ./utils/sweeper.nix { };
wacomtablet = callPackage ./utils/wacomtablet.nix { };
}; };
kdewebdev = combinePkgs "kdewebdev" { kdewebdev = combinePkgs "kdewebdev" {

View File

@ -6193,6 +6193,8 @@ let
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
kde_wacomtablet = newScope pkgs.kde4 ../applications/misc/kde-wacomtablet { };
kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { }; kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { };
kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { }; kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { };