From b080c1172053c74ea38b1095efd7504d29382ba0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 10:32:31 +0000 Subject: [PATCH] * eggdbus now needs zlib because it uses glib's Requires.private. Maybe zlib should be a propagatedBuildInput in glib, not sure. svn path=/nixpkgs/branches/x-updates/; revision=22662 --- pkgs/development/tools/misc/eggdbus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 97031a533fa..bbc0988aa86 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 }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, zlib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - buildInputs = [ pkgconfig glib dbus.libs dbus_glib ]; + buildInputs = [ pkgconfig glib dbus.libs dbus_glib zlib ]; meta = { homepage = http://hal.freedesktop.org/releases/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dee8abbda73..2b7d0622ad9 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; + inherit stdenv fetchurl pkgconfig dbus dbus_glib glib zlib; }; elfutils = import ../development/tools/misc/elfutils {