Move kdevplatform and kdevelop to all-packages.nix

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

1 files changed, 2 insertions, 12 deletions

diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index bbd654f5da29..2c474df78d60 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -235,17 +235,6 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
 
-  kdevelop = import ./extragear/kdevelop {
-    inherit (pkgs) stdenv fetchurl cmake pkgconfig shared_mime_info gettext perl;
-    inherit kdevplatform automoc4 kdebase_workspace;
-  };
-
-  kdevplatform = import ./extragear/kdevplatform {
-    inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig
-      apr aprutil boost;
-    inherit kdelibs automoc4 phonon;
-  };
-
   kdesvn = import ./extragear/kdesvn {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4;
     inherit kdelibs;
@@ -277,7 +266,8 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
   
-  inherit (pkgs) konversation yakuake ktorrent koffice amarok;
+  inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform
+    kdevelop;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;