gnome: use callPackage, move to gnome-2

gnome28 was a mix of packages from various releases, so do not mention 2.28 in
the attribute name.

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

56 files changed, 946 insertions, 0 deletions

diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
new file mode 100644
index 000000000000..c140eb944c6c
--- /dev/null
+++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtkmm, libglade }:
+
+stdenv.mkDerivation rec {
+  name = "libglademm-2.6.7";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2";
+    sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
+  };
+  
+  buildInputs = [ pkgconfig intltool ];
+  
+  propagatedBuildInputs = [ gtkmm libglade ];
+}
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
new file mode 100644
index 000000000000..814b054f74e7
--- /dev/null
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -0,0 +1,133 @@
+{ callPackage, self, stdenv, gettext, overrides ? {} }:
+{
+  __overrides = overrides;
+
+  # Backward compatibility.
+  gtkdoc = self.gtk_doc;
+  startupnotification = self.startup_notification;
+  gnomedocutils = self.gnome_doc_utils;
+  gnomeicontheme = self.gnome_icon_theme;
+  gnomepanel = self.gnome_panel;
+
+#### PLATFORM
+
+  audiofile = callPackage ./platform/audiofile { };
+
+  esound = callPackage ./platform/esound { };
+
+  libIDL = callPackage ./platform/libIDL {
+    gettext = if stdenv.isDarwin then gettext else null;
+  };
+
+  ORBit2 = callPackage ./platform/ORBit2 { };
+
+  libart_lgpl = callPackage ./platform/libart_lgpl { };
+
+  libglade = callPackage ./platform/libglade { };
+
+  libgnomeprint = callPackage ./platform/libgnomeprint { };
+
+  libgnomeprintui = callPackage ./platform/libgnomeprintui { };
+
+  libgnomecups = callPackage ./platform/libgnomecups { };
+
+  libgtkhtml = callPackage ./platform/libgtkhtml { };
+
+  intltool = callPackage ./platform/intltool { };
+
+  GConf = callPackage ./platform/GConf { };
+
+  libgnomecanvas = callPackage ./platform/libgnomecanvas { };
+
+  libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
+
+  # for git-head builds
+  gnome_common = callPackage platform/gnome-common { };
+
+  gnome_mime_data = callPackage ./platform/gnome-mime-data { };
+
+  gnome_vfs = callPackage ./platform/gnome-vfs { };
+
+  gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { };
+
+  libgnome = callPackage ./platform/libgnome { };
+
+  libgnomeui = callPackage ./platform/libgnomeui { };
+
+  libbonobo = callPackage ./platform/libbonobo { };
+
+  libbonoboui = callPackage ./platform/libbonoboui { };
+
+  at_spi = callPackage ./platform/at-spi { };
+
+  glib_networking = callPackage ./platform/glib-networking { };
+
+  gtk_doc = callPackage ./platform/gtk-doc { };
+
+  gtkhtml = callPackage ./platform/gtkhtml { };
+
+
+  # Freedesktop library
+  startup_notification = callPackage ./platform/startup-notification { };
+
+  # Required for nautilus
+  libunique = callPackage ./platform/libunique { };
+
+  gtkglext = callPackage ./platform/gtkglext { };
+
+#### DESKTOP
+
+  gnome_keyring = callPackage ./desktop/gnome-keyring { };
+
+  libsoup = callPackage ./desktop/libsoup { };
+
+  libwnck = callPackage ./desktop/libwnck { };
+
+  # Not part of GNOME desktop, but provides CSS support for librsvg
+  libcroco = callPackage ./desktop/libcroco { };
+
+  librsvg = callPackage ./desktop/librsvg { };
+
+  libgweather = callPackage ./desktop/libgweather { };
+
+  gvfs = callPackage ./desktop/gvfs { };
+
+  libgnomekbd = callPackage ./desktop/libgnomekbd { };
+
+  # Removed from recent GNOME releases, but still required
+  scrollkeeper = callPackage ./desktop/scrollkeeper { };
+
+  # scrollkeeper replacement
+  rarian = callPackage ./desktop/rarian { };
+
+  gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
+
+  zenity = callPackage ./desktop/zenity { };
+
+  metacity = callPackage ./desktop/metacity { };
+
+  gnome_menus = callPackage ./desktop/gnome-menus { };
+
+  gnome_desktop = callPackage ./desktop/gnome-desktop { };
+
+  gnome_panel = callPackage ./desktop/gnome-panel { };
+
+  gnome_session = callPackage ./desktop/gnome-session { };
+
+  gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { };
+
+  gnome_control_center = callPackage ./desktop/gnome-control-center { };
+
+  gtksourceview = callPackage ./desktop/gtksourceview { };
+
+  nautilus = callPackage ./desktop/nautilus { };
+
+  gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { };
+
+  vte = callPackage ./desktop/vte { };
+
+#### BINDINGS
+
+  libglademm = callPackage ./bindings/libglademm { };
+
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
new file mode 100644
index 000000000000..7d7e6cb6aec6
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, hal, cairo, popt, which, python
+, shared_mime_info, desktop_file_utils, libunique, libtool, bzip2
+, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
+, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon
+, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}:
+
+stdenv.mkDerivation {
+  name = "gnome-control-center-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2;
+    sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp";
+  };
+  buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
+                  gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 
+                  libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ];
+  configureFlags = "--disable-scrollkeeper";
+  # This makes me cry
+  CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+
+             "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo "+
+             "-I${pango}/include/pango-1.0 -I${atk}/include/atk-1.0 "+
+	     "-I${gnome_desktop}/include/gnome-desktop-2.0 -I${gnome_menus}/include/gnome-menus "+
+	     "-I${libgnomeui}/include/libgnomeui-2.0 -I${libbonoboui}/include/libbonoboui-2.0 "+
+	     "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+
+	     "-I${libgnome}/include/libgnome-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+
+	     "-I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+
+	     "-I${ORBit2}/include/orbit-2.0 -I${GConf}/include/gconf/2 -I${librsvg}/include/librsvg-2 "+
+	     "-I${gnome_panel}/include/panel-2.0";
+  LIBS = "-lXft -lglib-2.0 -lgtk-x11-2.0 -lrsvg-2 -lgconf-2 -lgnome-desktop-2 -lgnome-menu -lgnomeui-2";
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
new file mode 100644
index 000000000000..8c011ad27699
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk
+, intltool, GConf, gnome_doc_utils}:
+
+stdenv.mkDerivation {
+  name = "gnome-desktop-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-desktop/2.28/gnome-desktop-2.28.0.tar.bz2;
+    sha256 = "1raag5c74pyy0f1i37fjxyxcnk9ck4mh6c1hcdmv5dv40xndwvwp";
+  };
+  configureFlags = "--disable-scrollkeeper";
+  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk
+                  intltool GConf gnome_doc_utils ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
new file mode 100644
index 000000000000..58d3dfd0a8f7
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool, scrollkeeper,
+  makeWrapper}:
+
+stdenv.mkDerivation {
+  name = "gnome-doc-utils-0.18.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-doc-utils/0.18/gnome-doc-utils-0.18.0.tar.bz2;
+    sha256 = "1937zr088vn7vhy9rwfc021ih21hhf700c3m4ria8mlcpcvh1380";
+  };
+  configureFlags = "--disable-scrollkeeper";
+  buildInputs = [ python pkgconfig libxml2Python libxslt intltool scrollkeeper 
+    makeWrapper ];
+  postInstall = ''
+    wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \
+      ''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH} \
+  '';
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
new file mode 100644
index 000000000000..22aeb8a0f59f
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-icon-theme-2.28.0";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-icon-theme/2.28/${name}.tar.bz2";
+    sha256 = "111q1yijm8mjvz600nfa49gbjz4988vpfv74jcknfng0k92vvv1i";
+  };
+  
+  buildInputs = [ pkgconfig intltool iconnamingutils ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
new file mode 100644
index 000000000000..f49cb1c2d1c0
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, gtk, intltool, GConf}:
+
+stdenv.mkDerivation {
+  name = "gnome-keyring-2.28.0";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-keyring/2.28/gnome-keyring-2.28.0.tar.bz2;
+    sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv";
+  };
+  
+  buildInputs = [ pkgconfig dbus.libs libgcrypt pam python gtk intltool GConf ];
+
+  propagatedBuildInputs = [ glib libtasn1 ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
new file mode 100644
index 000000000000..811f19f046e8
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, python, glib, intltool}:
+
+stdenv.mkDerivation {
+  name = "gnome-menus-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-menus/2.28/gnome-menus-2.28.0.tar.bz2;
+    sha256 = "1lgkqa5gn0g61mfmr2xj2yfg4qjpdavj8rgbdg4bldznphmhp11s";
+  };
+  buildInputs = [ pkgconfig python glib intltool ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
new file mode 100644
index 000000000000..774b1ff508b1
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python
+, glib, gtk, pango, atk, libXau
+, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop
+, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}:
+
+stdenv.mkDerivation {
+  name = "gnome-panel-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-panel/2.28/gnome-panel-2.28.0.tar.bz2;
+    sha256 = "0rc4f6vmyrm3s8ncbll0a1ik2j1gg068fq3xal120sc4iw68q5n1";
+  };
+  buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2Python libxslt bzip2 python libXau
+                  intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop 
+		  libwnck librsvg libgweather gnome_doc_utils libtasn1 ];
+  configureFlags = "--disable-scrollkeeper";
+  CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/include/gio-unix-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_glib}/include/dbus-1.0 -I${dbus.libs}/include/dbus-1.0 "+
+             "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 "+
+	     "-I${atk}/include/atk-1.0 -I${ORBit2}/include/orbit-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+
+	     "-I${libgnomeui}/include/libgnomeui-2.0 -I${libgnome}/include/libgnome-2.0 -I${GConf}/include/gconf/2 "+
+	     "-I${libglade}/include/libglade-2.0 -I${gnome_menus}/include/gnome-menus -I${gnome_desktop}/include/gnome-desktop-2.0 "+
+	     "-I${libbonoboui}/include/libbonoboui-2.0 -I${libbonobo}/include/libbonobo-2.0 -I${libgnomecanvas}/include/libgnomecanvas-2.0 "+
+	     "-I${libart_lgpl}/include/libart-2.0 -I${librsvg}/include/librsvg-2 -I${libwnck}/include/libwnck-1.0";
+  LIBS = "-lORBit-2 -lbonobo-2 -lgtk-x11-2.0 -lgconf-2 -lgnomeui-2 -lglade-2.0 -lgnome-menu -lgnome-desktop-2 -lrsvg-2 -lwnck-1";
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
new file mode 100644
index 000000000000..10ccc3c936cb
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto
+, intltool, libglade, startup_notification, GConf}:
+
+stdenv.mkDerivation {
+  name = "gnome-session-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-session/2.28/gnome-session-2.28.0.tar.bz2;
+    sha256 = "032wfr70z61fnfk7snw8kck914z6y4wxr6v0dcgil3q9zc29ms43";
+  };
+  buildInputs = [ pkgconfig dbus_glib gtk libXau libXtst inputproto intltool libglade startup_notification GConf ];
+  CPPFLAGS = "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${dbus_glib}/include/dbus-1.0 "+
+             "-I${pango}/include/pango-1.0 -I${atk}/include/atk-1.0 -I${cairo}/include/cairo "+
+	     "-I${dbus.libs}/include/dbus-1.0 -I${dbus.libs}/lib/dbus-1.0/include "+
+	     "-I${libglade}/include/libglade-2.0";
+  LIBS = "-lglade-2.0 -ldbus-glib-1";
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
new file mode 100644
index 000000000000..094c421f67e9
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk
+, intltool, GConf, gnome_desktop, libglade, libgnomekbd}:
+
+stdenv.mkDerivation {
+  name = "gnome-settings-daemon-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-settings-daemon/2.28/gnome-settings-daemon-2.28.0.tar.bz2;
+    sha256 = "1md46vs3m36czwjdkz084facanjr03cxgr50frf2yln60kc06cnz";
+  };
+  buildInputs = [ pkgconfig intltool dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
new file mode 100644
index 000000000000..aa1080012d52
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango, 
+  libxml2Python, perl, intltool, gettext}:
+
+stdenv.mkDerivation {
+  name = "gtksourceview-2.9.9";
+  src = fetchurl {
+    url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
+    sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
+  };
+  buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
+    gettext];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh b/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
new file mode 100644
index 000000000000..5be453c09a24
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
@@ -0,0 +1,9 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    sed -i -e "/giomodulesdir=/ agiomodulesdir=$out/lib/gio" configure
+}
+
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
new file mode 100644
index 000000000000..058c6eb2457c
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, pkgconfig, dbus, samba, hal, libarchive, fuse, libgphoto2
+, cdparanoia, libxml2, libtool, glib, intltool, GConf, gnome_keyring, libsoup}:
+
+stdenv.mkDerivation {
+  name = "gvfs-1.4.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gvfs/1.4/gvfs-1.4.0.tar.bz2;
+    sha256 = "1fzqq21888c1w357kcy8m12393wd6jjlk4pg118npn11m4gbb13s";
+  };
+  builder = ./builder.sh;
+  buildInputs = [ pkgconfig dbus.libs samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool
+                  glib intltool GConf gnome_keyring libsoup ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/libcroco/default.nix b/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
new file mode 100644
index 000000000000..e724940e31df
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, libxml2, glib}:
+
+stdenv.mkDerivation {
+  name = "libcroco-0.6.2";
+  src = fetchurl {
+    url = mirror://gnome/sources/libcroco/0.6/libcroco-0.6.2.tar.bz2;
+    sha256 = "0j8p6xlpdhhbzjznr7rx7jiy3fi95qib0gsnkv9n76y0chzqa95y";
+  };
+  buildInputs = [ pkgconfig libxml2 glib ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
new file mode 100644
index 000000000000..f8ceff4d94ac
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}:
+
+stdenv.mkDerivation {
+  name = "libgnomekbd-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/libgnomekbd/2.28/libgnomekbd-2.28.0.tar.bz2;
+    sha256 = "0s1664nwsavwjfmg4wkhvrpz9qxw04nsx5l8z87nlrny3312rnkj";
+  };
+  buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
new file mode 100644
index 000000000000..736857fca930
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp}:
+
+#Is this really necessary?
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  name = "libgweather-2.30.3";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgweather/2.30/${name}.tar.bz2";
+    sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq";
+  };
+  configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo";
+  buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/librsvg/default.nix b/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
new file mode 100644
index 000000000000..3472f606f863
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco}:
+
+stdenv.mkDerivation {
+  name = "librsvg-2.26.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/librsvg/2.26/librsvg-2.26.0.tar.bz2;
+    sha256 = "1sivagvlyr58hxgazr6pyq3yfxbg0wrv7rgzsk5xi631v3qbbjpx";
+  };
+  buildInputs = [ pkgconfig libxml2 libgsf bzip2 libcroco ];
+  propagatedBuildInputs = [ glib gtk ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
new file mode 100644
index 000000000000..34d185bfe027
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, 
+  glib, GConf, gnome_keyring}:
+
+stdenv.mkDerivation rec {
+  name = "libsoup-2.33.6";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libsoup/2.33/${name}.tar.bz2";
+    sha256 = "988f7897fe125a77a5946b2fd6d47d7374fd94a1406e810482cfff6a52a6a923";
+  };
+  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
+    glib GConf gnome_keyring ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/libwnck/default.nix b/pkgs/desktops/gnome-2/desktop/libwnck/default.nix
new file mode 100644
index 000000000000..6c4445454e9a
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/libwnck/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, libX11, gtk, intltool}:
+
+stdenv.mkDerivation {
+  name = "libwnck-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/libwnck/2.28/libwnck-2.28.0.tar.bz2;
+    sha256 = "0ixr2sffbcm6gn29vmli7x30cfi1848w8vgdhy93m8zg5xny62yr";
+  };
+  buildInputs = [ pkgconfig libX11 gtk intltool ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix
new file mode 100644
index 000000000000..4e7996b44e56
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/metacity/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage
+, libcanberra, intltool, GConf, startup_notification, zenity, gnome_doc_utils}:
+
+stdenv.mkDerivation {
+  name = "metacity-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/metacity/2.28/metacity-2.28.0.tar.bz2;
+    sha256 = "0iamb6gw6gl6bfs7nqxpwr9xiij5axxr1iy4bl6g9z11dwx5a886";
+  };
+  buildInputs = [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra
+                  intltool GConf startup_notification zenity gnome_doc_utils ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix
new file mode 100644
index 000000000000..3765e6112d68
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif, gtk, gnome_desktop, libunique, intltool, GConf}:
+
+stdenv.mkDerivation {
+  name = "nautilus-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/nautilus/2.28/nautilus-2.28.0.tar.bz2;
+    sha256 = "0wmskjxf231r2vra22zy02561gh5q10pj3lhzya13dvlliyv4q9p";
+  };
+  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk gnome_desktop libunique intltool GConf ];
+}
diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
new file mode 100644
index 000000000000..77a2b710f447
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
+
+stdenv.mkDerivation rec {
+  name = "rarian-0.8.1";
+  src = fetchurl {
+    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
+    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
+  };
+  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
+}
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
new file mode 100644
index 000000000000..97dcbf4e0041
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}:
+
+stdenv.mkDerivation {
+  name = "scrollkeeper-0.3.14";
+  src = fetchurl {
+    url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2;
+    sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
+  };
+
+  # The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess
+  preConfigure = "
+    substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog
+    cp ${automake}/share/automake*/config.{sub,guess} .
+  ";
+
+  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
+}
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
new file mode 100644
index 000000000000..c061a2684792
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses
+, pythonSupport ? false, python}:
+
+stdenv.mkDerivation rec {
+  name = "vte-0.28.0";
+  
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.28/${name}.tar.bz2";
+    sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql";
+  };
+
+  buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
+                stdenv.lib.optional pythonSupport python;
+                
+  configureFlags = ''
+    ${if pythonSupport then "--enable-python" else "--disable-python"}
+  '';
+  
+  meta = {
+    homepage = http://www.gnome.org/;
+    description = "A library implementing a terminal emulator widget for GTK+";
+    longDescription = ''
+      VTE is a library (libvte) implementing a terminal emulator widget for
+      GTK+, and a minimal sample application (vte) using that.  Vte is
+      mainly used in gnome-terminal, but can also be used to embed a
+      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
+      character set conversion, as well as emulating any terminal known to
+      the system's terminfo database.
+    '';
+    license = "LGPLv2";
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
new file mode 100644
index 000000000000..dd81e1e78dea
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk, gnome_doc_utils, intltool, libglade,
+  libX11}:
+
+stdenv.mkDerivation {
+  name = "zenity-2.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/zenity/2.28/zenity-2.28.0.tar.bz2;
+    sha256 = "0qwcrkgqsldxmh29xlbakh6lc3qz8sp6kmk1ca7fc3kbwhya4irp";
+  };
+  configureFlags = "--disable-scrollkeeper";
+  buildInputs = [ pkgconfig gtk gnome_doc_utils intltool libglade libxml2 libxslt libX11];
+  CPPFLAGS = "-I${cairo}/include/cairo -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+
+             "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${pango}/include/pango-1.0 "+
+	     "-I${atk}/include/atk-1.0 -I${libglade}/include/libglade-2.0";
+  LIBS = "-lgtk-x11-2.0 -lglade-2.0 -lX11";
+}
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
new file mode 100644
index 000000000000..1b3af898f6eb
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2
+, policykit, intltool, dbus_libs }:
+
+stdenv.mkDerivation {
+  name = "GConf-2.26.2";
+  
+  src = fetchurl {
+    url = mirror://gnome/platform/2.26/2.26.2/sources/GConf-2.26.2.tar.bz2;
+    sha256 = "1vb7hjxddy54g4vch936621g66n0mhi3wkhm9lwqh449vdqg4yki";
+  };
+
+  buildInputs = [ pkgconfig ORBit2 dbus_libs dbus_glib libxml2 policykit intltool ];
+  propagatedBuildInputs = [ glib ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
new file mode 100644
index 000000000000..0d536e830b1f
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, glib, libIDL}:
+
+stdenv.mkDerivation {
+  name = "ORBit2-2.14.17";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.17.tar.bz2;
+    sha256 = "0k4px2f949ac7vmj7b155g1rpf7pmvl48sbnkjhlg4wgcwzwxgv2";
+  };
+  
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib libIDL ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
new file mode 100644
index 000000000000..ccf18958c935
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi
+, intltool, libbonobo, ORBit2}:
+
+stdenv.mkDerivation {
+  name = "at-spi-1.28.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/at-spi/1.28/at-spi-1.28.0.tar.bz2;
+    sha256 = "0rv616drqpk58vybi3kalzyx06dxg26iwkbcrzk5563avhhj5qpb";
+  };
+  buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi
+                  intltool libbonobo ORBit2 ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
new file mode 100644
index 000000000000..74a3e2670297
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "audiofile-0.2.6";
+  src = fetchurl {
+    url = mirror://gnome/sources/audiofile/0.2/audiofile-0.2.6.tar.bz2;
+    sha256 = "1d00w9hxx3flfs6cjyja99y8vpj1qwa34zfdj96dpa54drd9da62";
+  };
+}
diff --git a/pkgs/desktops/gnome-2/platform/esound/default.nix b/pkgs/desktops/gnome-2/platform/esound/default.nix
new file mode 100644
index 000000000000..e273251bfa58
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/esound/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, alsaLib, audiofile}:
+
+stdenv.mkDerivation {
+  name = "esound-0.2.41";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/esound/0.2/esound-0.2.41.tar.bz2;
+    sha256 = "04a9ldy7hsvry1xmfhzg5is2dabsp8m6a82vkai64d2blqlxvday";
+  };
+  
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ alsaLib audiofile ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
new file mode 100644
index 000000000000..53ab1ba08406
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
+  , libgcrypt, libtasn1
+  }:
+
+stdenv.mkDerivation {
+  name = "glib-networking-2.28.5";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/glib-networking/2.28/glib-networking-2.28.5.tar.bz2;
+    sha256 = "959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876";
+  };
+
+  configureFlags = [
+    "--without-ca-certificates"
+  ];
+  
+  preBuild = ''
+    sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
+  '';
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt 
+    libtasn1];
+}
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
new file mode 100644
index 000000000000..1d2e17241632
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchgit, pkgconfig, autoconf, automake, libtool}:
+
+stdenv.mkDerivation {
+  name = "gnome-common-2.28.0";
+  src =  fetchgit {
+    url = mirror://gnome/sources/gnome-common/2.28/gnome-common-2.28.0.tar.bz2;
+    sha256 = "18dnx5hndl19lpk6i3ybfsssfasma5wi7p9mqw05sx137l81fj6x";
+  };
+  buildInputs = [ pkgconfig automake autoconf libtool
+    ];
+  preConfigure = ''
+    ./autogen.sh
+  '';
+}
diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
new file mode 100644
index 000000000000..c3aee9024a20
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, intltool}:
+
+stdenv.mkDerivation {
+  name = "gnome-mime-data-2.18.0";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2;
+    sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p";
+  };
+  buildInputs = [ intltool ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
new file mode 100644
index 000000000000..95fa9d38e7a7
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}:
+
+stdenv.mkDerivation {
+  name = "gnome-vfs-monikers-2.15.3";
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2;
+    sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15";
+  };
+  buildInputs = [ pkgconfig glib intltool gnome_vfs libbonobo ];
+  CPPFLAGS = "-I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+
+             "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${ORBit2}/include/orbit-2.0 "+
+	     "-I${gnome_vfs}/include/gnome-vfs-2.0";
+}
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
new file mode 100644
index 000000000000..c141da4324df
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl_gnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
+, glib, fam, hal, cdparanoia, intltool, GConf, gnome_mime_data}:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "gnome-vfs";
+    major = "2"; minor = "24"; patchlevel = "4";
+    sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
+  };
+
+  buildInputs =
+    [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
+      intltool gnome_mime_data
+    ]
+    ++ (if stdenv.isLinux then [hal] else []);
+
+  propagatedBuildInputs = [ GConf glib ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
new file mode 100644
index 000000000000..90a9088d4562
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt
+, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex }:
+
+let version = "1.15"; in
+stdenv.mkDerivation {
+  name = "gtk-doc-${version}";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtk-doc/${version}/gtk-doc-${version}.tar.bz2";
+    sha256 = "0ca8wh67nyh574ahlfkx8k9w2bm4ji9yzxvi3afsicqdpyx77k2r";
+  };
+
+  # maybe there is a better way to pass the needed dtd and xsl files
+  # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
+  preConfigure = ''
+    ensureDir $out/nix-support
+    cat > $out/nix-support/catalog.xml << EOF
+    <?xml version="1.0"?>
+    <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+    <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+      <nextCatalog  catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" />
+      <nextCatalog  catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" />
+    </catalog>
+    EOF
+
+    configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper";
+  '';
+
+  buildInputs =
+   [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 docbook_xsl
+     gnome_doc_utils dblatex
+   ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
new file mode 100644
index 000000000000..4eab4b8213c6
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, gtk, mesa, pango }:
+
+stdenv.mkDerivation rec {
+  name = "gtkglext-1.2.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkglext/1.2/${name}.tar.bz2";
+    sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n";
+  };
+
+  buildInputs = [ pkgconfig gtk mesa pango ];
+
+  # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and
+  # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.
+  CPPFLAGS = "-UGTK_DISABLE_DEPRECATED";
+
+  meta = {
+    homepage = http://projects.gnome.org/gtkglext/;
+
+    description = "GtkGLExt, an OpenGL extension to GTK+";
+
+    longDescription =
+      '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK
+         objects which support OpenGL rendering in GTK+ and GtkWidget API
+         add-ons to make GTK+ widgets OpenGL-capable.  In contrast to Janne
+         Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables
+         OpenGL drawing for standard and custom GTK+ widgets.
+      '';
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
new file mode 100644
index 000000000000..1d9a179d236b
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
@@ -0,0 +1,17 @@
+diff -Naur gtkhtml-3.32.2-orig/configure gtkhtml-3.32.2/configure
+--- gtkhtml-3.32.2-orig/configure	2011-02-05 23:12:31.000000000 -0500
++++ gtkhtml-3.32.2/configure	2011-04-22 13:03:18.228874636 -0400
+@@ -5761,12 +5761,7 @@
+ 
+ if test "x${enable_deprecated_flags}" = "xyes"; then
+ 
+-  list="-DG_DISABLE_DEPRECATED
+-		-DPANGO_DISABLE_DEPRECATED
+-		-DGDK_DISABLE_DEPRECATED
+-		-DGDK_PIXBUF_DISABLE_DEPRECATED
+-		-DGTK_DISABLE_DEPRECATED
+-		-DGNOME_DISABLE_DEPRECATED"
++  list=""
+   flags_supported=""
+   flags_unsupported=""
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
new file mode 100644
index 000000000000..49161c1a7455
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, gtk, intltool,
+GConf, enchant, isocodes, gnome_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gtkhtml-3.32.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkhtml/3.32/${name}.tar.bz2";
+    sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7";
+  };
+
+  #From Debian, fixes build issue described here:
+  #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
+  patches = [ ./01_remove-disable-deprecated.patch ];
+
+  buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/intltool/default.nix b/pkgs/desktops/gnome-2/platform/intltool/default.nix
new file mode 100644
index 000000000000..51eaa4a2cf48
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/intltool/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}:
+
+stdenv.mkDerivation rec {
+  name = "intltool-0.40.6";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/intltool/0.40/intltool-0.40.6.tar.bz2;
+    sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ perl perlXMLParser gettext ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
new file mode 100644
index 000000000000..f48b0821f126
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext ? null}:
+
+stdenv.mkDerivation {
+  name = "libIDL-0.8.13";
+  src = fetchurl {
+    url = mirror://gnome/sources/libIDL/0.8/libIDL-0.8.13.tar.bz2;
+    sha256 = "0w9b4q5sllwncz498sj5lmc3ajzc8x74dy0jy27m2yg9v887xk5w";
+  };
+  buildInputs = [ flex bison pkgconfig glib gettext ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
new file mode 100644
index 000000000000..320372786a50
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libart_lgpl-2.3.20";
+  src = fetchurl {
+    url = mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2;
+    sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym";
+  };
+}
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
new file mode 100644
index 000000000000..9910965cf917
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt, intltool, ORBit2}:
+
+stdenv.mkDerivation {
+  name = "libbonobo-2.24.2";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2;
+    sha256 = "1gr85amd271z0lbr68crcsc24rx1pa5k20f67y3y2mx664527h4m";
+  };
+  
+  buildInputs = [ flex bison pkgconfig dbus_glib libxml2 intltool ];
+  propagatedBuildInputs = [ popt glib ORBit2 ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
new file mode 100644
index 000000000000..20169161b82a
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk
+, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
+
+stdenv.mkDerivation {
+  name = "libbonoboui-2.24.2";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2;
+    sha256 = "005ypnzb3mfsb0k0aa3h77vwc4ifjq6r4d11msqllvx7avfgkg5f";
+  };
+  
+  buildInputs = [ bison pkgconfig popt gtk libxml2 intltool GConf libglade ];
+  propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
new file mode 100644
index 000000000000..93490007692a
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}:
+
+stdenv.mkDerivation {
+  name = "libglade-2.6.4";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2;
+    sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4";
+  };
+  
+  buildInputs = [ pkgconfig gtk python gettext ];
+
+  propagatedBuildInputs = [ libxml2 ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
new file mode 100644
index 000000000000..76f213b5fa89
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl_gnome, pkgconfig, glib, popt, zlib, libcanberra
+, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool}:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+  
+  src = fetchurl_gnome {
+    project = "libgnome";
+    major = "2"; minor = "32"; patchlevel = "1";
+    sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
+  };
+  
+  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ];
+  propagatedBuildInputs = [ glib libbonobo ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
new file mode 100644
index 000000000000..95f484ff7a40
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
+
+stdenv.mkDerivation {
+  name = "libgnomecanvas-2.26.0";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2;
+    sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40";
+  };
+  
+  buildInputs = [ pkgconfig intltool libglade ];
+
+  propagatedBuildInputs = [ libart_lgpl gtk ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
new file mode 100644
index 000000000000..4d0f3061c450
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm }:
+
+stdenv.mkDerivation {
+  name = "libgnomecanvasmm-2.26.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2;
+    sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918";
+  };
+
+  buildInputs = [ pkgconfig libgnomecanvas gtkmm ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
new file mode 100644
index 000000000000..0521ce9058fb
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }:
+
+let
+  name = "libgnomecups-0.2.3";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2";
+    sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71";
+  };
+
+  buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ];
+  propagatedBuildInputs = [ libxml2 ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
new file mode 100644
index 000000000000..54b5d6382428
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison,
+flex }:
+
+let
+  name = "libgnomeprint-2.18.8";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2";
+    sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691";
+  };
+
+  buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ];
+  propagatedBuildInputs = [ libxml2 ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
new file mode 100644
index 000000000000..a406f9209a33
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
+
+stdenv.mkDerivation {
+  name = "libgnomeprintui-2.11.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2;
+    sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490";
+  };
+
+  buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
new file mode 100644
index 000000000000..d3edee3ffd3d
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
+, intltool, libgnome, libgnomecanvas, libbonoboui, GConf
+, gnome_vfs, gnome_keyring, libglade }:
+
+stdenv.mkDerivation {
+  name = "libgnomeui-2.24.2";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2;
+    sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f";
+  };
+  
+  buildInputs = [ pkgconfig intltool xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade ];
+
+  propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
new file mode 100644
index 000000000000..6aab400c60ae
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2 }:
+
+stdenv.mkDerivation {
+  name = "libgtkhtml-2.11.1";
+  
+  src = fetchurl {
+    url = mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2;
+    sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw";
+  };
+  
+  buildInputs = [ pkgconfig gtk gettext ];
+  propagatedBuildInputs = [ libxml2 ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix
new file mode 100644
index 000000000000..ed6d268fdeb2
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/libunique/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, gettext, gtk}:
+
+stdenv.mkDerivation {
+  name = "libunique-1.1.2";
+  src = fetchurl {
+    url = mirror://gnome/sources/libunique/1.1/libunique-1.1.2.tar.bz2;
+    sha256 = "0vhcbw4ccc58xhs99r6bkabrzbayyq2qk01xm8vv4hpwjl117yvk";
+  };
+  buildInputs = [ pkgconfig gettext gtk ];
+}
diff --git a/pkgs/desktops/gnome-2/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
new file mode 100644
index 000000000000..b82b8a50992a
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
@@ -0,0 +1,10 @@
+{ stdenv, fetchurl, pkgconfig, xlibs }:
+
+stdenv.mkDerivation {
+  name = "startup-notification-0.9";
+  src = fetchurl {
+    url = mirror://gnome/sources/startup-notification/0.9/startup-notification-0.9.tar.bz2;
+    sha256 = "03aqkgv8d29yx2vmv6bfdlxq3ahagrb7dbsvhd5d9acy6znimpk1";
+  };
+  buildInputs = [ pkgconfig xlibs.xlibs xlibs.xcbutil ];
+}