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

  desktops.

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

40 files changed, 45 insertions, 19 deletions

diff --git a/pkgs/development/libraries/gnome/GConf/default.nix b/pkgs/desktops/gnome/GConf/default.nix
index 74b646f6cc34..74b646f6cc34 100644
--- a/pkgs/development/libraries/gnome/GConf/default.nix
+++ b/pkgs/desktops/gnome/GConf/default.nix
diff --git a/pkgs/development/libraries/gnome/ORBit2/default.nix b/pkgs/desktops/gnome/ORBit2/default.nix
index 69f62fb79a68..69f62fb79a68 100644
--- a/pkgs/development/libraries/gnome/ORBit2/default.nix
+++ b/pkgs/desktops/gnome/ORBit2/default.nix
diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 6484f7adcfa3..6484f7adcfa3 100644
--- a/pkgs/development/libraries/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
diff --git a/pkgs/development/libraries/gnome/esound/default.nix b/pkgs/desktops/gnome/esound/default.nix
index eb3727bc1c2a..eb3727bc1c2a 100644
--- a/pkgs/development/libraries/gnome/esound/default.nix
+++ b/pkgs/desktops/gnome/esound/default.nix
diff --git a/pkgs/development/libraries/gnome/gail/default.nix b/pkgs/desktops/gnome/gail/default.nix
index 2957aa90de58..2957aa90de58 100644
--- a/pkgs/development/libraries/gnome/gail/default.nix
+++ b/pkgs/desktops/gnome/gail/default.nix
diff --git a/pkgs/development/libraries/gnome/gnome-desktop/default.nix b/pkgs/desktops/gnome/gnome-desktop/default.nix
index ecd575cfd3d5..ecd575cfd3d5 100644
--- a/pkgs/development/libraries/gnome/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome/gnome-desktop/default.nix
diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix b/pkgs/desktops/gnome/gnome-icon-theme/default.nix
index e5c7d408c65e..e5c7d408c65e 100644
--- a/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome/gnome-icon-theme/default.nix
diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch b/pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch
index 81b12cd1449f..81b12cd1449f 100644
--- a/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch
+++ b/pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch
diff --git a/pkgs/development/libraries/gnome/gnome-keyring/default.nix b/pkgs/desktops/gnome/gnome-keyring/default.nix
index d781cbbb523e..d781cbbb523e 100644
--- a/pkgs/development/libraries/gnome/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome/gnome-keyring/default.nix
diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix b/pkgs/desktops/gnome/gnome-mime-data/default.nix
index 90012a62075c..90012a62075c 100644
--- a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix
+++ b/pkgs/desktops/gnome/gnome-mime-data/default.nix
diff --git a/pkgs/development/libraries/gnome/gnome-panel/default.nix b/pkgs/desktops/gnome/gnome-panel/default.nix
index 49ef9203f31a..49ef9203f31a 100644
--- a/pkgs/development/libraries/gnome/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome/gnome-panel/default.nix
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/desktops/gnome/gnome-vfs/default.nix
index 75f9ed77a85d..75f9ed77a85d 100644
--- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome/gnome-vfs/default.nix
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch b/pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch
index e34b74bb8a17..e34b74bb8a17 100644
--- a/pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch
+++ b/pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch
diff --git a/pkgs/development/libraries/gnome/gtkhtml/default.nix b/pkgs/desktops/gnome/gtkhtml/default.nix
index b5b6caad4690..b5b6caad4690 100644
--- a/pkgs/development/libraries/gnome/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome/gtkhtml/default.nix
diff --git a/pkgs/development/libraries/gnome/gtksourceview/default.nix b/pkgs/desktops/gnome/gtksourceview/default.nix
index 8ad7955e8d40..8ad7955e8d40 100644
--- a/pkgs/development/libraries/gnome/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome/gtksourceview/default.nix
diff --git a/pkgs/development/libraries/gnome/imlib/default.nix b/pkgs/desktops/gnome/imlib/default.nix
index c42ccbce167c..c42ccbce167c 100644
--- a/pkgs/development/libraries/gnome/imlib/default.nix
+++ b/pkgs/desktops/gnome/imlib/default.nix
diff --git a/pkgs/development/libraries/gnome/intltool/default.nix b/pkgs/desktops/gnome/intltool/default.nix
index 8807f7ab897e..8807f7ab897e 100644
--- a/pkgs/development/libraries/gnome/intltool/default.nix
+++ b/pkgs/desktops/gnome/intltool/default.nix
diff --git a/pkgs/development/libraries/gnome/libIDL/default.nix b/pkgs/desktops/gnome/libIDL/default.nix
index 2a2dd49e2d16..2a2dd49e2d16 100644
--- a/pkgs/development/libraries/gnome/libIDL/default.nix
+++ b/pkgs/desktops/gnome/libIDL/default.nix
diff --git a/pkgs/development/libraries/gnome/libart_lgpl/default.nix b/pkgs/desktops/gnome/libart_lgpl/default.nix
index 4f05f788b4d8..4f05f788b4d8 100644
--- a/pkgs/development/libraries/gnome/libart_lgpl/default.nix
+++ b/pkgs/desktops/gnome/libart_lgpl/default.nix
diff --git a/pkgs/development/libraries/gnome/libbonobo/default.nix b/pkgs/desktops/gnome/libbonobo/default.nix
index 03b4cd556259..03b4cd556259 100644
--- a/pkgs/development/libraries/gnome/libbonobo/default.nix
+++ b/pkgs/desktops/gnome/libbonobo/default.nix
diff --git a/pkgs/development/libraries/gnome/libbonoboui/default.nix b/pkgs/desktops/gnome/libbonoboui/default.nix
index ba0b3aee0ad8..ba0b3aee0ad8 100644
--- a/pkgs/development/libraries/gnome/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome/libbonoboui/default.nix
diff --git a/pkgs/development/libraries/gnome/libglade/default.nix b/pkgs/desktops/gnome/libglade/default.nix
index 2719379359c8..2719379359c8 100644
--- a/pkgs/development/libraries/gnome/libglade/default.nix
+++ b/pkgs/desktops/gnome/libglade/default.nix
diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/desktops/gnome/libgnome/default.nix
index dda72143bd36..dda72143bd36 100644
--- a/pkgs/development/libraries/gnome/libgnome/default.nix
+++ b/pkgs/desktops/gnome/libgnome/default.nix
diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix b/pkgs/desktops/gnome/libgnomecanvas/default.nix
index 6602cf43ebc5..6602cf43ebc5 100644
--- a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome/libgnomecanvas/default.nix
diff --git a/pkgs/development/libraries/gnome/libgnomeprint/default.nix b/pkgs/desktops/gnome/libgnomeprint/default.nix
index 6a44c549f4ca..6a44c549f4ca 100644
--- a/pkgs/development/libraries/gnome/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome/libgnomeprint/default.nix
diff --git a/pkgs/development/libraries/gnome/libgnomeprintui/default.nix b/pkgs/desktops/gnome/libgnomeprintui/default.nix
index 34f2b7994985..34f2b7994985 100644
--- a/pkgs/development/libraries/gnome/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome/libgnomeprintui/default.nix
diff --git a/pkgs/development/libraries/gnome/libgnomeui/default.nix b/pkgs/desktops/gnome/libgnomeui/default.nix
index af1d81e69845..af1d81e69845 100644
--- a/pkgs/development/libraries/gnome/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome/libgnomeui/default.nix
diff --git a/pkgs/development/libraries/gnome/libgtkhtml/default.nix b/pkgs/desktops/gnome/libgtkhtml/default.nix
index 839ce4014714..839ce4014714 100644
--- a/pkgs/development/libraries/gnome/libgtkhtml/default.nix
+++ b/pkgs/desktops/gnome/libgtkhtml/default.nix
diff --git a/pkgs/development/libraries/gnome/libsoup/default.nix b/pkgs/desktops/gnome/libsoup/default.nix
index 0e93c70ae9a6..0e93c70ae9a6 100644
--- a/pkgs/development/libraries/gnome/libsoup/default.nix
+++ b/pkgs/desktops/gnome/libsoup/default.nix
diff --git a/pkgs/development/libraries/gnome/libwnck/default.nix b/pkgs/desktops/gnome/libwnck/default.nix
index 03912ef8044f..03912ef8044f 100644
--- a/pkgs/development/libraries/gnome/libwnck/default.nix
+++ b/pkgs/desktops/gnome/libwnck/default.nix
diff --git a/pkgs/development/libraries/gnome/make-listing.pl b/pkgs/desktops/gnome/make-listing.pl
index 3fc6d3fee667..3fc6d3fee667 100755
--- a/pkgs/development/libraries/gnome/make-listing.pl
+++ b/pkgs/desktops/gnome/make-listing.pl
diff --git a/pkgs/development/libraries/gnome/scrollkeeper/default.nix b/pkgs/desktops/gnome/scrollkeeper/default.nix
index ffdbe0659127..ffdbe0659127 100644
--- a/pkgs/development/libraries/gnome/scrollkeeper/default.nix
+++ b/pkgs/desktops/gnome/scrollkeeper/default.nix
diff --git a/pkgs/development/libraries/gnome/scrollkeeper/xmlcatalog.patch b/pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch
index 77313819fceb..77313819fceb 100644
--- a/pkgs/development/libraries/gnome/scrollkeeper/xmlcatalog.patch
+++ b/pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.14.3.nix
index eb1e09040bce..eb1e09040bce 100644
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
+++ b/pkgs/desktops/gnome/src-gnome-desktop-2.14.3.nix
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix b/pkgs/desktops/gnome/src-gnome-platform-2.14.3.nix
index c6f90204fc94..c6f90204fc94 100644
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
+++ b/pkgs/desktops/gnome/src-gnome-platform-2.14.3.nix
diff --git a/pkgs/development/libraries/gnome/startup-notification/default.nix b/pkgs/desktops/gnome/startup-notification/default.nix
index b8df1c22edc3..b8df1c22edc3 100644
--- a/pkgs/development/libraries/gnome/startup-notification/default.nix
+++ b/pkgs/desktops/gnome/startup-notification/default.nix
diff --git a/pkgs/development/libraries/kde/arts/default.nix b/pkgs/desktops/kde/arts/default.nix
index 4fdd914ccffa..4fdd914ccffa 100644
--- a/pkgs/development/libraries/kde/arts/default.nix
+++ b/pkgs/desktops/kde/arts/default.nix
diff --git a/pkgs/development/libraries/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix
index d8f0107007ec..d8f0107007ec 100644
--- a/pkgs/development/libraries/kde/kdelibs/default.nix
+++ b/pkgs/desktops/kde/kdelibs/default.nix
diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix
new file mode 100644
index 000000000000..4fdd914ccffa
--- /dev/null
+++ b/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];
+
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0653636fcf3a..0fca820bc830 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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