From b8928b09fd4a2ceb267163c95e59d7f097352c3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jul 2010 11:43:45 +0000
Subject: [PATCH] * Okay, make zlib a propagated build input of glib.

svn path=/nixpkgs/branches/x-updates/; revision=22666
---
 pkgs/development/libraries/glib/2.24.x.nix      | 4 +++-
 pkgs/development/tools/misc/eggdbus/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                 | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix
index bc17f4b906c..6fdb18e9b4d 100644
--- a/pkgs/development/libraries/glib/2.24.x.nix
+++ b/pkgs/development/libraries/glib/2.24.x.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04";
   };
 
-  buildInputs = [ pkgconfig gettext perl libiconv zlib ];
+  buildInputs = [ pkgconfig gettext perl libiconv ];
+
+  propagatedBuildInputs = [ zlib ];
 
   meta = {
     description = "GLib, a C library of programming buildings blocks";
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index bbc0988aa86..97031a533fa 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, zlib }:
+{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }:
 
 stdenv.mkDerivation rec {
   name = "eggdbus-0.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
   };
   
-  buildInputs = [ pkgconfig glib dbus.libs dbus_glib zlib ];
+  buildInputs = [ pkgconfig glib dbus.libs dbus_glib ];
 
   meta = {
     homepage = http://hal.freedesktop.org/releases/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b7d0622ad9..dee8abbda73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3235,7 +3235,7 @@ let
   };
 
   eggdbus = import ../development/tools/misc/eggdbus {
-    inherit stdenv fetchurl pkgconfig dbus dbus_glib glib zlib;
+    inherit stdenv fetchurl pkgconfig dbus dbus_glib glib;
   };
 
   elfutils = import ../development/tools/misc/elfutils {