From 9845dc5aecb902fd78c8ef0b0c408cd5b6410685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Mar 2009 22:26:15 +0000
Subject: [PATCH] GNOME: Fix GConf, libgnomecanvas, libgnomeui.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14673
---
 pkgs/desktops/gnome/default.nix | 13 ++++++++++---
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 344d07a42da..b74662db961 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -43,7 +43,11 @@ rec {
 
   GConf = stdenv.mkDerivation {
     inherit (platform.GConf) name src;
-    buildInputs = [pkgconfig perl glib gtk libxml2 popt gettext perlXMLParser];
+    buildInputs = [
+      pkgconfig perl glib gtk libxml2
+      dbus dbus_glib
+      popt gettext perlXMLParser intltool
+    ];
     propagatedBuildInputs = [ORBit2];
   };
 
@@ -90,7 +94,10 @@ rec {
 
   libgnomecanvas = stdenv.mkDerivation {
     inherit (platform.libgnomecanvas) name src;
-    buildInputs = [pkgconfig libglade perl perlXMLParser gail gettext];
+    buildInputs = [
+      pkgconfig libglade perl perlXMLParser gail
+      gettext intltool
+    ];
     propagatedBuildInputs = [gtk libart_lgpl];
   };
 
@@ -108,7 +115,7 @@ rec {
 
   libgnomeui = import ./libgnomeui.nix {
     inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser
-      libjpeg esound gettext;
+      libjpeg esound gettext intltool;
     input = platform.libgnomeui;
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 141d1af29ec..d261542c275 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9192,7 +9192,7 @@ let
       flex bison popt zlib libxml2 libxslt
       perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412
       gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
-      libcm python dbus_glib ncurses which libxml2Python
+      libcm python dbus dbus_glib ncurses which libxml2Python
       iconnamingutils openssl hal samba fam libgcrypt libtasn1
       xmlto docbook2x docbook_xsl intltool;
   });