From 88eb04c0dce0f6be8fff4a777cc00a79e2aec87b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 20 May 2009 17:39:18 +0000
Subject: [PATCH] adding zenity to gnome desktop nix expressions making it
 possible to build metacity and gconf-editor

patch provided by Christoph Herbst

svn path=/nixpkgs/trunk/; revision=15681
---
 pkgs/desktops/gnome/default.nix           | 15 ++++++++++++++-
 pkgs/desktops/gnome/metacity.nix          |  3 ++-
 pkgs/os-specific/linux/polkit/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix           |  8 +++++++-
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/polkit/default.nix

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 7d0d056c971f..ae0e0b743bf7 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -294,13 +294,25 @@ rec {
 
   metacity = import ./metacity.nix {
     inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk
-      GConf startupnotification gettext libcm intltool;
+      GConf startupnotification gettext libcm intltool zenity gnomedocutils;
     inherit (xlibs) libXinerama libXrandr libXcursor
       libXcomposite libXfixes libXdamage;
     enableCompositor = true;
     input = desktop.metacity;
   };
 
+  zenity = stdenv.mkDerivation {
+    inherit (desktop.zenity) name src;
+  
+    buildInputs = [
+      pkgconfig glib gtk
+      gettext intltool gnomedocutils libglade
+      libxslt
+    ];
+
+    configureFlags = "--disable-scrollkeeper";
+  };
+
   gnomedocutils = import ./gnome-doc-utils.nix {
     inherit stdenv fetchurl pkgconfig perl perlXMLParser python
       libxml2 libxslt gettext libxml2Python;
@@ -313,6 +325,7 @@ rec {
     buildInputs = [
       pkgconfig perl perlXMLParser GConf gnomedocutils
       gtk libgnome libgnomeui gettext libxslt intltool
+      policyKit dbus_glib
     ];
 
     configureFlags = "--disable-scrollkeeper";
diff --git a/pkgs/desktops/gnome/metacity.nix b/pkgs/desktops/gnome/metacity.nix
index 184efc2a165e..9d22add6af8c 100644
--- a/pkgs/desktops/gnome/metacity.nix
+++ b/pkgs/desktops/gnome/metacity.nix
@@ -1,6 +1,6 @@
 { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk
 , GConf, startupnotification, libXinerama, libXrandr, libXcursor
-, gettext, intltool
+, gettext, intltool, zenity, gnomedocutils
 
 , enableCompositor ? false
 , libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [
     pkgconfig perl perlXMLParser glib gtk GConf startupnotification
     libXinerama libXrandr libXcursor gettext intltool
+    zenity gnomedocutils
   ]
   ++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm];
   
diff --git a/pkgs/os-specific/linux/polkit/default.nix b/pkgs/os-specific/linux/polkit/default.nix
new file mode 100644
index 000000000000..1314371c5648
--- /dev/null
+++ b/pkgs/os-specific/linux/polkit/default.nix
@@ -0,0 +1,16 @@
+args: with args;
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  name = "PolicyKit-0.9";
+  
+  src = fetchurl {
+    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7";
+  };
+  
+  buildInputs = [
+   pkgconfig expat intltool glib dbus dbus_glib pam gettext
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d900840cf04..9685fb0b094a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5267,6 +5267,12 @@ let
     inherit lib;
   };
 
+  policyKit = import ../os-specific/linux/polkit {
+    inherit fetchurl stdenv pkgconfig intltool expat dbus dbus_glib pam;
+    inherit gettext;
+    inherit (gtkLibs) glib;
+  };
+  
   powertop = import ../os-specific/linux/powertop {
     inherit fetchurl stdenv ncurses gettext;
   };
@@ -7357,7 +7363,7 @@ let
       gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
       libcm python dbus dbus_glib ncurses which libxml2Python
       iconnamingutils openssl hal samba fam libgcrypt libtasn1
-      xmlto docbook2x docbook_xsl intltool enchant isocodes;
+      xmlto docbook2x docbook_xsl intltool enchant isocodes policyKit;
   });
 
   kde3 = {