Pass individual packages in kde-4.7

E.g., use
{ ..., marble, ... } : marble
instead of
{ ..., kdeedu, ... } : kdeedu.marble

svn path=/nixpkgs/trunk/; revision=28694

7 files changed, 15 insertions, 16 deletions

diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix b/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
index 1ddb753dc41c..55c243f60dd9 100644
--- a/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
@@ -1,13 +1,13 @@
 { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
   lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
   consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
-  kdebindings
+  pykde4
 }:
 
 kde {
 
   buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt kdebindings.pykde4
+    [ kdelibs qimageblitz libdbusmenu_qt pykde4
       xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
       xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
       xorg.libpthreadstubs
diff --git a/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix
index 26668bf26630..13c145f32753 100644
--- a/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix
+++ b/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdebindings, perl }:
+{ kde, cmake, smokeqt, perl }:
 
 kde {
-  buildInputs = [ kdebindings.smokeqt perl ];
+  buildInputs = [ smokeqt perl ];
   buildNativeInputs = [ cmake ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix
index 18fb5b85029d..c49a77a48ed6 100644
--- a/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix
+++ b/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, kdebindings }:
+{ kde, kdelibs, smokeqt }:
 
 kde {
-  propagatedBuildInputs = [ kdelibs kdebindings.smokeqt ];
+  propagatedBuildInputs = [ kdelibs smokeqt ];
 
   meta = {
     description = "C++ parser used to generate language bindings for Qt/KDE";
diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
index 37d7c530fdf3..0d0aa816a941 100644
--- a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
+++ b/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
@@ -1,9 +1,9 @@
-{ kde, qt4, cmake, phonon, qimageblitz, kdebindings }:
+{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
 
 kde {
   propagatedBuildInputs = [ qt4 phonon qimageblitz ];
   buildNativeInputs = [ cmake ];
-  propagatedBuildNativeInputs = [ kdebindings.smokegen ];
+  propagatedBuildNativeInputs = [ smokegen ];
 
   meta = {
     description = "C++ parser used to generate language bindings for Qt/KDE";
diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix
index d5fe4ec893e4..3378a99d9e79 100644
--- a/pkgs/desktops/kde-4.7/kdegames.nix
+++ b/pkgs/desktops/kde-4.7/kdegames.nix
@@ -1,11 +1,11 @@
-{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, kdebindings,
+{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
   openal, libsndfile, qhull }:
 
 kde rec {
   buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
     openal libsndfile qhull ] ++ pythonPath;
 
-  pythonPath = [ pythonPackages.twisted kdebindings.pykde4 ];
+  pythonPath = [ pythonPackages.twisted pykde4 ];
 
   # TODO: ggz
 
diff --git a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix b/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
index bb473ec605eb..2c2ba3796a2c 100644
--- a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
+++ b/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, kdegraphics }:
+{ kde, kdelibs, okular }:
 
 kde {
-  buildInputs = [ kdelibs kdegraphics.okular ];
+  buildInputs = [ kdelibs okular ];
 
   meta = {
     description = "A collection of plugins to handle mobipocket files";
diff --git a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
index 8e9d151db2e7..de2cabf20e4f 100644
--- a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
@@ -1,16 +1,15 @@
-{ kde, kdelibs, kdeedu, shared_desktop_ontologies
+{ kde, kdelibs, marble, shared_desktop_ontologies
 , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
 , kdepimlibs, libkexiv2, libqalculate, libXtst }:
 # TODO: qwt, scim
-# TODO: parts of kdegraphics, kdeedu
 
 kde {
 
-  KDEDIRS=kdeedu.marble;
+  KDEDIRS=marble;
 
   buildInputs = [ kdelibs boost eigen kde_workspace
     attica python qca2 qimageblitz kdepimlibs
-    libqalculate libXtst shared_desktop_ontologies kdeedu.marble libkexiv2];
+    libqalculate libXtst shared_desktop_ontologies marble libkexiv2];
 
   meta = {
     description = "KDE Plasma Addons";