* Refactoring: move KDE and Gnome out of development/libraries into

desktops.

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

pkgs/development/libraries/arts/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg, libpng, perl, qt}:
+
+stdenv.mkDerivation {
+  name = "arts-1.5.4";
+
+  KDEDIR = kdelibs;
+  configureFlags = "
+    --with-extra-includes=${libjpeg}/include
+    --with-extra-libs=${libjpeg}/lib
+    --x-includes=${libX11}/include
+    --x-libraries=${libX11}/lib";
+
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/arts-1.5.4.tar.bz2;
+    md5 = "886ba4a13dc0da312d94c09f50c3ffe6";
+  };
+
+  buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng perl qt];
+
+}
+
+

pkgs/top-level/all-packages.nix

@@ -1204,7 +1204,7 @@ rec {
     bdbSupport = true;
   };
 
-  arts = import ../development/libraries/kde/arts {
+  arts = import ../development/libraries/arts {
     inherit fetchurl stdenv pkgconfig;
     inherit (xlibs) libX11 libXext;
     inherit kdelibs zlib libjpeg libpng perl;
@@ -1337,15 +1337,6 @@ rec {
     inherit (gtkLibs) glib;
   };
 
-  gnome = recurseIntoAttrs (import ../development/libraries/gnome {
-    inherit fetchurl stdenv pkgconfig audiofile
-            flex bison popt zlib libxml2 libxslt
-            perl perlXMLParser docbook_xml_dtd_42 gettext x11
-            libtiff libjpeg libpng bzip2;
-    gtkLibs = gtkLibs210; # !!! correct?
-    inherit (xlibs) libXmu;
-  });
-
   gpgme = import ../development/libraries/gpgme {
     inherit fetchurl stdenv libgpgerror gnupg;
   };
@@ -1426,15 +1417,6 @@ rec {
     inherit (xlibs) libX11 libXext xextproto;
   };
 
-  kdelibs = import ../development/libraries/kde/kdelibs {
-    inherit
-      fetchurl stdenv zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool
-      expat freetype bzip2;
-    inherit (xlibs) libX11 libXt libXext;
-    qt = qt3;
-  };
-
   lcms = import ../development/libraries/lcms {
     inherit fetchurl stdenv;
   };
@@ -3021,6 +3003,28 @@ rec {
   };
 
 
+  ### DESKTOP ENVIRONMENTS
+
+
+  gnome = recurseIntoAttrs (import ../desktops/gnome {
+    inherit fetchurl stdenv pkgconfig audiofile
+            flex bison popt zlib libxml2 libxslt
+            perl perlXMLParser docbook_xml_dtd_42 gettext x11
+            libtiff libjpeg libpng bzip2;
+    gtkLibs = gtkLibs210; # !!! correct?
+    inherit (xlibs) libXmu;
+  });
+
+  kdelibs = import ../desktops/kde/kdelibs {
+    inherit
+      fetchurl stdenv zlib perl openssl pcre pkgconfig
+      libjpeg libpng libtiff libxml2 libxslt libtool
+      expat freetype bzip2;
+    inherit (xlibs) libX11 libXt libXext;
+    qt = qt3;
+  };
+  
+
   ### MISC