From 5dde0fead7306d2101ec2106cf76fa9b2681a7b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2007 00:40:27 +0000
Subject: [PATCH] * Build Compiz with GConf support. * Add some Gnome
 interdependencies.

svn path=/nixpkgs/trunk/; revision=8125
---
 pkgs/applications/window-managers/compiz/default.nix | 6 +++---
 pkgs/desktops/gnome/default.nix                      | 6 +++---
 pkgs/desktops/gnome/gnome-keyring.nix                | 4 ++--
 pkgs/desktops/gnome/gnome-mime-data.nix              | 4 ++--
 pkgs/desktops/gnome/libbonobo.nix                    | 4 ++--
 pkgs/top-level/all-packages.nix                      | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 485f026078fe..bf37e0db5851 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
 , libXdamage, libXrandr, libXinerama, libICE, libSM
-, startupnotification, libXrender, xextproto, mesa, gtk, libwnck
+, startupnotification, libXrender, xextproto, mesa, gtk, libwnck, GConf
 }:
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   buildInputs = [
     pkgconfig libpng libXcomposite libXfixes libXdamage libXrandr
     libXinerama libICE libSM startupnotification libXrender xextproto
-    mesa gtk libwnck
+    mesa gtk libwnck GConf
   ];
-  configureFlags = "--disable-gconf --enable-gtk";
+  configureFlags = "--enable-gtk";
 }
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 512be33a177f..967e9f1c7e99 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -45,7 +45,7 @@ rec {
   };
 
   gnomemimedata = import ./gnome-mime-data.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser gettext;
     input = platform.gnomemimedata;
   };
 
@@ -84,7 +84,7 @@ rec {
   };
 
   libbonobo = import ./libbonobo.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex gettext;
     yacc = bison;
     input = platform.libbonobo;
   };
@@ -141,7 +141,7 @@ rec {
   };
 
   gnomekeyring = import ./gnome-keyring.nix {
-    inherit fetchurl stdenv pkgconfig glib gtk;
+    inherit fetchurl stdenv pkgconfig glib gtk perl perlXMLParser gettext;
     input = desktop.gnomekeyring;
   };
 
diff --git a/pkgs/desktops/gnome/gnome-keyring.nix b/pkgs/desktops/gnome/gnome-keyring.nix
index d781cbbb523e..5d544c638519 100644
--- a/pkgs/desktops/gnome/gnome-keyring.nix
+++ b/pkgs/desktops/gnome/gnome-keyring.nix
@@ -1,9 +1,9 @@
 # gnome-keyring
 
-{input, stdenv, fetchurl, pkgconfig, glib, gtk}:
+{input, stdenv, fetchurl, pkgconfig, glib, gtk, perl, perlXMLParser, gettext}:
 
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig gtk glib];
+  buildInputs = [pkgconfig gtk glib perl perlXMLParser gettext];
   CFLAGS = "-DENABLE_NLS=0";
 }
diff --git a/pkgs/desktops/gnome/gnome-mime-data.nix b/pkgs/desktops/gnome/gnome-mime-data.nix
index 90012a62075c..0e86ccdb4471 100644
--- a/pkgs/desktops/gnome/gnome-mime-data.nix
+++ b/pkgs/desktops/gnome/gnome-mime-data.nix
@@ -1,8 +1,8 @@
-{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:
+{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}:
 
 assert pkgconfig != null && perl != null;
 
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser];
+  buildInputs = [pkgconfig perl perlXMLParser gettext];
 }
diff --git a/pkgs/desktops/gnome/libbonobo.nix b/pkgs/desktops/gnome/libbonobo.nix
index 03b4cd556259..5a4bdf5f9580 100644
--- a/pkgs/desktops/gnome/libbonobo.nix
+++ b/pkgs/desktops/gnome/libbonobo.nix
@@ -1,4 +1,4 @@
-{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, ORBit2, libxml2, popt, yacc, flex}:
+{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, ORBit2, libxml2, popt, yacc, flex, gettext}:
 
 assert pkgconfig != null && perl != null && ORBit2 != null
   && libxml2 != null && popt != null && yacc != null && flex != null;
@@ -6,6 +6,6 @@ assert pkgconfig != null && perl != null && ORBit2 != null
 # todo 2.8.1 doesn;t work
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 yacc flex];
+  buildInputs = [pkgconfig perl perlXMLParser libxml2 yacc flex gettext];
   propagatedBuildInputs = [ORBit2 popt];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d290114305e8..8427abfdc665 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2535,7 +2535,7 @@ rec {
     inherit fetchurl stdenv pkgconfig libpng mesa;
     inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
       libXinerama libICE libSM libXrender xextproto;
-    inherit (gnome) startupnotification libwnck;
+    inherit (gnome) startupnotification libwnck GConf;
     inherit (gtkLibs) gtk;
   };