57 files changed, 143 insertions, 348 deletions
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
deleted file mode 100644
index 432535e5595a..000000000000
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ /dev/null
@@ -1,338 +0,0 @@
-pkgs:
-pkgs.makeOverridable
-(__overrides: rec {
-  inherit __overrides;
-
-  inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
-
-  # Backward compatibility.
-  startupnotification = startup_notification;
-  gnomedocutils = gnome_doc_utils;
-  gnomeicontheme = gnome_icon_theme;
-  gnomepanel = gnome_panel;
-
-#### PLATFORM
-
-  audiofile = import ./platform/audiofile {
-    inherit (pkgs) stdenv fetchurl;
-  };
-
-  esound = import ./platform/esound {
-    inherit (pkgs) stdenv fetchurl pkgconfig alsaLib;
-    inherit audiofile;
-  };
-
-  libIDL = import ./platform/libIDL {
-    inherit (pkgs) stdenv fetchurl flex bison pkgconfig;
-    inherit (pkgs.gtkLibs) glib;
-    gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null;
-  };
-
-  ORBit2 = import ./platform/ORBit2 {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gtkLibs) glib;
-    inherit libIDL;
-  };
-
-  libart_lgpl = import ./platform/libart_lgpl {
-    inherit (pkgs) stdenv fetchurl;
-  };
-
-  libglade = import ./platform/libglade {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgnomeprint = import ./platform/libgnomeprint {
-    inherit intltool libart_lgpl libgnomecups;
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2 bison flex;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgnomeprintui = import ./platform/libgnomeprintui {
-    inherit intltool libgnomecanvas libgnomeprint gnomeicontheme;
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgnomecups = import ./platform/libgnomecups {
-    inherit intltool libart_lgpl;
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  libgtkhtml = import ./platform/libgtkhtml {
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  intltool = import ./platform/intltool {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext;
-  };
-
-  GConf = import ./platform/GConf {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 policykit;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool ORBit2;
-    dbus_libs = pkgs.dbus.libs;
-  };
-
-  libgnomecanvas = import ./platform/libgnomecanvas {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool libart_lgpl libglade;
-  };
-
-  libgnomecanvasmm = import ./platform/libgnomecanvasmm {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit libgnomecanvas gtkmm;
-  };
-
-  # for git-head builds
-  gnome_common = import platform/gnome-common {
-    inherit (pkgs) stdenv fetchgit pkgconfig
-      autoconf automake libtool;
-  };
-
-  gnome_mime_data = import ./platform/gnome-mime-data {
-    inherit (pkgs) stdenv fetchurl;
-    inherit intltool;
-  };
-
-  gnome_vfs = import ./platform/gnome-vfs {
-    inherit (pkgs) stdenv fetchurl_gnome pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool GConf gnome_mime_data;
-  };
-
-  gnome_vfs_monikers = import ./platform/gnome-vfs-monikers {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool gnome_vfs libbonobo ORBit2;
-  };
-
-  libgnome = import ./platform/libgnome {
-    inherit (pkgs) stdenv fetchurl_gnome libcanberra pkgconfig popt zlib libtool;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool libbonobo GConf gnome_vfs ORBit2;
-  };
-
-  libgnomeui = import ./platform/libgnomeui {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs;
-    inherit intltool libgnome libgnomecanvas libbonoboui GConf;
-    inherit gnome_vfs gnome_keyring libglade glib pango;
-  };
-
-  libbonobo = import ./platform/libbonobo {
-    inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool ORBit2;
-  };
-
-  libbonoboui = import ./platform/libbonoboui {
-    inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2;
-    inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk;
-  };
-
-  at_spi = import ./platform/at-spi {
-    inherit (pkgs) stdenv fetchurl python pkgconfig popt;
-    inherit (pkgs.xlibs) libX11 libICE libXtst libXi;
-    inherit (pkgs.gtkLibs) atk gtk;
-    inherit intltool libbonobo ORBit2;
-  };
-
-  glib_networking = import ./platform/glib-networking {
-    inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2
-      libproxy libgcrypt libtasn1;
-  };
-
-  gtk_doc = import ./platform/gtk-doc {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl python libxml2 libxslt;
-    inherit (pkgs) docbook_xml_dtd_43 docbook_xsl dblatex;
-    inherit gnome_doc_utils;
-  };
-
-  # What name should we use??
-  gtkdoc = gtk_doc;
-
-  gtkhtml = import ./platform/gtkhtml {
-    inherit (pkgs.gtkLibs) gtk;
-    inherit (pkgs) fetchurl stdenv pkgconfig intltool enchant isocodes;
-    inherit GConf gnome_icon_theme;
-  };
-
-
-  # Freedesktop library
-  startup_notification = import ./platform/startup-notification {
-    inherit (pkgs) stdenv fetchurl pkgconfig xlibs;
-  };
-
-  # Required for nautilus
-  libunique = import ./platform/libunique {
-    inherit (pkgs) stdenv fetchurl pkgconfig gettext;
-    inherit (pkgs.gtkLibs) gtk;
-  };
-
-  gtkglext = import ./platform/gtkglext {
-    inherit (pkgs) stdenv fetchurl mesa pkgconfig;
-    inherit (pkgs.gtkLibs) gtk pango;
-  };
-
-#### DESKTOP
-
-  gnome_keyring = import ./desktop/gnome-keyring {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam python;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit intltool GConf;
-  };
-
-  libsoup = import ./desktop/libsoup {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
-    inherit (pkgs.gtkLibs) glib;
-    inherit GConf gnome_keyring;
-  };
-
-  libwnck = import ./desktop/libwnck {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.xlibs) libX11;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool;
-  };
-
-  # Not part of GNOME desktop, but provides CSS support for librsvg
-  libcroco = import ./desktop/libcroco {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2;
-    inherit (pkgs.gtkLibs) glib;
-  };
-
-  librsvg = import ./desktop/librsvg {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit libcroco;
-  };
-
-  libgweather = import ./desktop/libgweather {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1 nettle gmp;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool GConf libsoup;
-  };
-
-  gvfs = import ./desktop/gvfs {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool GConf gnome_keyring libsoup;
-  };
-
-  libgnomekbd = import ./desktop/libgnomekbd {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit intltool GConf libglade;
-  };
-
-  # Removed from recent GNOME releases, but still required
-  scrollkeeper = import ./desktop/scrollkeeper {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42 automake;
-  };
-
-  # scrollkeeper replacement
-  rarian = import ./desktop/rarian {
-    inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42;
-  };
-
-  gnome_doc_utils = import ./desktop/gnome-doc-utils {
-    inherit (pkgs) stdenv fetchurl python pkgconfig libxslt
-      makeWrapper;
-    inherit intltool scrollkeeper;
-    libxml2 = pkgs.libxml2Python;
-  };
-
-  zenity = import ./desktop/zenity {
-    inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt;
-    inherit (pkgs.gtkLibs) glib gtk pango atk;
-    inherit gnome_doc_utils intltool libglade;
-    inherit (pkgs.xlibs) libX11;
-  };
-
-  metacity = import ./desktop/metacity {
-    inherit (pkgs) stdenv fetchurl pkgconfig libcanberra;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit (pkgs.xlibs) libXcomposite libXcursor libXdamage;
-    inherit intltool GConf startup_notification zenity gnome_doc_utils;
-  };
-
-  gnome_menus = import ./desktop/gnome-menus {
-    inherit (pkgs) stdenv fetchurl pkgconfig python;
-    inherit (pkgs.gtkLibs) glib;
-    inherit intltool;
-  };
-
-  gnome_desktop = import ./desktop/gnome-desktop {
-    inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which;
-    libxml2 = pkgs.libxml2Python;
-    inherit (pkgs.xlibs) libX11;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool GConf gnome_doc_utils;
-  };
-
-  gnome_panel = import ./desktop/gnome-panel {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt libtasn1;
-    libxml2 = pkgs.libxml2Python;
-    inherit (pkgs.gtkLibs) glib gtk pango atk;
-    inherit (pkgs.xlibs) libXau;
-    inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop;
-    inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl;
-  };
-
-  gnome_session = import ./desktop/gnome-session {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus;
-    inherit (pkgs.gtkLibs) gtk pango atk;
-    inherit (pkgs.xlibs) libXau libXtst inputproto;
-    inherit intltool libglade startup_notification GConf;
-  };
-
-  gnome_settings_daemon = import ./desktop/gnome-settings-daemon {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit intltool GConf gnome_desktop libglade libgnomekbd;
-  };
-
-  gnome_control_center = import ./desktop/gnome-control-center {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal libtool bzip2;
-    inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils;
-    inherit (pkgs.gtkLibs) glib gtk pango atk;
-    inherit gnome_doc_utils intltool GConf libglade libgnome libgnomeui libgnomekbd libunique;
-    inherit librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon;
-    inherit libbonobo libbonoboui libgnomecanvas libart_lgpl gnome_vfs ORBit2;
-    libxml2 = pkgs.libxml2Python;
-  };
-
-  gtksourceview = import ./desktop/gtksourceview {
-    inherit (pkgs) stdenv fetchurl pkgconfig cairo perl intltool
-      gettext;
-    inherit (pkgs.gtkLibs) atk glib gtk pango;
-    libxml2 = pkgs.libxml2Python;
-  };
-
-  nautilus = import ./desktop/nautilus {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit gnome_desktop libunique intltool GConf;
-  };
-
-  gnome_icon_theme = import ./desktop/gnome-icon-theme {
-    inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils;
-  };
-
-  vte = import ./desktop/vte {
-    inherit (pkgs) stdenv fetchurl pkgconfig ncurses python;
-    inherit intltool glib gtk;
-  };
-
-#### BINDINGS
-
-  libglademm = import ./bindings/libglademm {
-    inherit (pkgs) stdenv fetchurl pkgconfig intltool;
-    inherit gtkmm libglade;
-  };
-
-}) {}
diff --git a/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
index c140eb944c6c..c140eb944c6c 100644
--- a/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
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.28/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index 4ebbd20d2292..7d7e6cb6aec6 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python
+{ 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
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2;
     sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp";
   };
-  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
+  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";
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
index e048488bff81..8c011ad27699 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2, libxslt, which, libX11, gtk
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk
 , intltool, GConf, gnome_doc_utils}:
 
 stdenv.mkDerivation {
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
     sha256 = "1raag5c74pyy0f1i37fjxyxcnk9ck4mh6c1hcdmv5dv40xndwvwp";
   };
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ pkgconfig python libxml2 libxslt which libX11 gtk
+  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk
                   intltool GConf gnome_doc_utils ];
 }
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
index c2e49deb009e..58d3dfd0a8f7 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper,
+{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool, scrollkeeper,
   makeWrapper}:
 
 stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1937zr088vn7vhy9rwfc021ih21hhf700c3m4ria8mlcpcvh1380";
   };
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper 
+  buildInputs = [ python pkgconfig libxml2Python libxslt intltool scrollkeeper 
     makeWrapper ];
   postInstall = ''
     wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
index 22aeb8a0f59f..22aeb8a0f59f 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
index f49cb1c2d1c0..f49cb1c2d1c0 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
index 811f19f046e8..811f19f046e8 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
index 48b2ca2f8eff..774b1ff508b1 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python
+{ 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}:
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/gnome-panel/2.28/gnome-panel-2.28.0.tar.bz2;
     sha256 = "0rc4f6vmyrm3s8ncbll0a1ik2j1gg068fq3xal120sc4iw68q5n1";
   };
-  buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau
+  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";
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
index 10ccc3c936cb..10ccc3c936cb 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
index 094c421f67e9..094c421f67e9 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 64dbd8e1a6f3..aa1080012d52 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango, 
-  libxml2, perl, intltool, gettext}:
+  libxml2Python, perl, intltool, gettext}:
 
 stdenv.mkDerivation {
   name = "gtksourceview-2.9.9";
@@ -7,6 +7,6 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
     sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
   };
-  buildInputs = [pkgconfig atk cairo glib gtk pango libxml2 perl intltool
+  buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
     gettext];
 }
diff --git a/pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh b/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
index 5be453c09a24..5be453c09a24 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh
+++ b/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
diff --git a/pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
index 058c6eb2457c..058c6eb2457c 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix b/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
index e724940e31df..e724940e31df 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
index f8ceff4d94ac..f8ceff4d94ac 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
index 736857fca930..736857fca930 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix b/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
index 3472f606f863..3472f606f863 100644
--- a/pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
index 34d185bfe027..34d185bfe027 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix b/pkgs/desktops/gnome-2/desktop/libwnck/default.nix
index 6c4445454e9a..6c4445454e9a 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libwnck/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix
index 4e7996b44e56..4e7996b44e56 100644
--- a/pkgs/desktops/gnome-2.28/desktop/metacity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/metacity/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix
index 3765e6112d68..3765e6112d68 100644
--- a/pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
index 77a2b710f447..77a2b710f447 100644
--- a/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
index 97dcbf4e0041..97dcbf4e0041 100644
--- a/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index c061a2684792..c061a2684792 100644
--- a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
diff --git a/pkgs/desktops/gnome-2.28/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
index dd81e1e78dea..dd81e1e78dea 100644
--- a/pkgs/desktops/gnome-2.28/desktop/zenity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index 1b3af898f6eb..1b3af898f6eb 100644
--- a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 0d536e830b1f..0d536e830b1f 100644
--- a/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
index ccf18958c935..ccf18958c935 100644
--- a/pkgs/desktops/gnome-2.28/platform/at-spi/default.nix
+++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
index 74a3e2670297..74a3e2670297 100644
--- a/pkgs/desktops/gnome-2.28/platform/audiofile/default.nix
+++ b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/esound/default.nix b/pkgs/desktops/gnome-2/platform/esound/default.nix
index e273251bfa58..e273251bfa58 100644
--- a/pkgs/desktops/gnome-2.28/platform/esound/default.nix
+++ b/pkgs/desktops/gnome-2/platform/esound/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
index 53ab1ba08406..53ab1ba08406 100644
--- a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
+++ b/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index 1d2e17241632..1d2e17241632 100644
--- a/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
index c3aee9024a20..c3aee9024a20 100644
--- a/pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
index 95fa9d38e7a7..95fa9d38e7a7 100644
--- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index c141da4324df..c141da4324df 100644
--- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
index 90a9088d4562..90a9088d4562 100644
--- a/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index 4eab4b8213c6..4eab4b8213c6 100644
--- a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
index 1d9a179d236b..1d9a179d236b 100644
--- a/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
index 49161c1a7455..49161c1a7455 100644
--- a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/intltool/default.nix b/pkgs/desktops/gnome-2/platform/intltool/default.nix
index 51eaa4a2cf48..51eaa4a2cf48 100644
--- a/pkgs/desktops/gnome-2.28/platform/intltool/default.nix
+++ b/pkgs/desktops/gnome-2/platform/intltool/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
index f48b0821f126..f48b0821f126 100644
--- a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
index 320372786a50..320372786a50 100644
--- a/pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index 9910965cf917..9910965cf917 100644
--- a/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index 20169161b82a..20169161b82a 100644
--- a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index 93490007692a..93490007692a 100644
--- a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 76f213b5fa89..76f213b5fa89 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 95f484ff7a40..95f484ff7a40 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
index 4d0f3061c450..4d0f3061c450 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
index 0521ce9058fb..0521ce9058fb 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
index 54b5d6382428..54b5d6382428 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index a406f9209a33..a406f9209a33 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index d3edee3ffd3d..d3edee3ffd3d 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
index 6aab400c60ae..6aab400c60ae 100644
--- a/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix
index ed6d268fdeb2..ed6d268fdeb2 100644
--- a/pkgs/desktops/gnome-2.28/platform/libunique/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libunique/default.nix
diff --git a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
index b82b8a50992a..b82b8a50992a 100644
--- a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix
+++ b/pkgs/desktops/gnome-2/platform/startup-notification/default.nix