From e7b76a6db30c388b3e5008994167ebc5b7e45b69 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 29 Jul 2011 12:41:31 +0000 Subject: [PATCH] * Updated kdetoys. svn path=/nixpkgs/branches/kde-4.7/; revision=27998 --- pkgs/desktops/kde-4.7/default.nix | 4 ++-- pkgs/desktops/kde-4.7/toys/amor.nix | 4 ++-- pkgs/desktops/kde-4.7/toys/kteatime.nix | 4 ++-- pkgs/desktops/kde-4.7/toys/ktux.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 95d6aa02743..58741a86e99 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -139,13 +139,13 @@ recurseIntoAttrs rec { umbrello = callPackage ./sdk/umbrello.nix { }; okteta = callPackage ./utils/okteta.nix { }; }; - + */ + kdetoys = combinePkgs "kdetoys" { amor = callPackage ./toys/amor.nix { }; kteatime = callPackage ./toys/kteatime.nix { }; ktux = callPackage ./toys/ktux.nix { }; }; - */ kdeutils = combinePkgs "kdeutils" { ark = callPackage ./utils/ark.nix { }; diff --git a/pkgs/desktops/kde-4.7/toys/amor.nix b/pkgs/desktops/kde-4.7/toys/amor.nix index dec967febde..3ff0706b9ba 100644 --- a/pkgs/desktops/kde-4.7/toys/amor.nix +++ b/pkgs/desktops/kde-4.7/toys/amor.nix @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon ]; meta = { description = "KDE creature for your desktop"; diff --git a/pkgs/desktops/kde-4.7/toys/kteatime.nix b/pkgs/desktops/kde-4.7/toys/kteatime.nix index 9df5d8ab528..54550d8f270 100644 --- a/pkgs/desktops/kde-4.7/toys/kteatime.nix +++ b/pkgs/desktops/kde-4.7/toys/kteatime.nix @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon ]; meta = { description = "KDE utility for making a fine cup of tea"; diff --git a/pkgs/desktops/kde-4.7/toys/ktux.nix b/pkgs/desktops/kde-4.7/toys/ktux.nix index 8d2df5974a0..8f350f083ba 100644 --- a/pkgs/desktops/kde-4.7/toys/ktux.nix +++ b/pkgs/desktops/kde-4.7/toys/ktux.nix @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4, kdebase_workspace }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, kde_workspace }: kde.package { - buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_workspace ]; meta = { description = "Tux Screen Saver";