* Gnome desktop.

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

2 files changed, 14 insertions, 5 deletions

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 8bbbe071597e6..902e3d494ae57 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -164,8 +164,8 @@ rec {
   };
 
   gnomedesktop = import ./gnome-desktop.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk
-            libgnomeui scrollkeeper libjpeg;
+    inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser
+      libjpeg gettext which python libxml2Python libxslt;
     input = desktop.gnomedesktop;
   };
 
diff --git a/pkgs/desktops/gnome/gnome-desktop.nix b/pkgs/desktops/gnome/gnome-desktop.nix
index ecd575cfd3d55..7aeae28e74f2c 100644
--- a/pkgs/desktops/gnome/gnome-desktop.nix
+++ b/pkgs/desktops/gnome/gnome-desktop.nix
@@ -1,8 +1,17 @@
-{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk
-, libgnomeui, scrollkeeper, libjpeg
+{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
+, libjpeg, gettext, which, python, libxml2Python, libxslt
 }:
 
+# !!! should get rid of libxml2Python, see gnomedocutils
+
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser gtk glib libgnomeui scrollkeeper libjpeg];
+  
+  buildInputs = [
+    pkgconfig perl perlXMLParser gnome.gtk gnome.glib gnome.libgnomeui
+    gnome.scrollkeeper libjpeg gnome.gnomedocutils gettext which
+    python libxml2Python libxslt    
+  ];
+
+  configureFlags = "--disable-scrollkeeper";
 }