diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 0b4dd97cff10..68885b1af6a0 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -103,7 +103,12 @@ scripts = callPackage ./sdk/scripts.nix { }; umbrello = callPackage ./sdk/umbrello.nix { }; }; - kdetoys = callPackage ./toys { }; + kdetoys = { + recurseForDerivations = true; + amor = callPackage ./toys/amor.nix { }; + kteatime = callPackage ./toys/kteatime.nix { }; + ktux = callPackage ./toys/ktux.nix { }; + }; kdeutils = { ark = callPackage ./utils/ark.nix { }; diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix index e90437b6cff5..c2f9848d9ad8 100644 --- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix +++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix @@ -140,4 +140,8 @@ builtins.listToAttrs name = "kdesdk-4.5.1.tar.bz2"; value = "0kwgd3hxc6jwk7qk67z1jaks9jg04hgh5aywyfs2dc8w2ns1xyhp"; } +{ + name = "kdetoys-4.5.1.tar.bz2"; + value = "194a6ylxi5jrfh3w3cy6jhdissshswdrv9pnir72z67ca13dvd9s"; +} ] diff --git a/pkgs/desktops/kde-4.5/toys/amor.nix b/pkgs/desktops/kde-4.5/toys/amor.nix new file mode 100644 index 000000000000..966953269e90 --- /dev/null +++ b/pkgs/desktops/kde-4.5/toys/amor.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + meta = { + description = "KDE creature for your desktop"; + kde = { + name = "amor"; + module = "kdetoys"; + version = "2.4.0"; + release = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/toys/default.nix b/pkgs/desktops/kde-4.5/toys/default.nix deleted file mode 100644 index d3f9298c8778..000000000000 --- a/pkgs/desktops/kde-4.5/toys/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{kde, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4}: - -kde.package { - - buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 ]; - meta = { - description = "KDE Toys"; - license = "GPL"; - kde = { - name = "kdetoys"; - version = "4.5.0"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/toys/kteatime.nix b/pkgs/desktops/kde-4.5/toys/kteatime.nix new file mode 100644 index 000000000000..5883d50b2b30 --- /dev/null +++ b/pkgs/desktops/kde-4.5/toys/kteatime.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, automoc4 }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 ]; + + meta = { + description = "KDE utility for making a fine cup of tea"; + kde = { + name = "kteatime"; + module = "kdetoys"; + version = "1.2.1"; + release = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/toys/ktux.nix b/pkgs/desktops/kde-4.5/toys/ktux.nix new file mode 100644 index 000000000000..d1193181a89e --- /dev/null +++ b/pkgs/desktops/kde-4.5/toys/ktux.nix @@ -0,0 +1,15 @@ +{ kde, cmake, kdelibs, automoc4, kdebase_workspace }: + +kde.package { + buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ]; + + meta = { + description = "Tux Screen Saver"; + kde = { + name = "ktux"; + module = "kdetoys"; + version = "1.0.1"; + release = "4.5.1"; + }; + }; +}