public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Okay, make zlib a propagated build input of glib.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=22666
This commit is contained in:
Eelco Dolstra 2010-07-19 11:43:45 +00:00
parent b080c11720
commit b8928b09fd
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glib/2.24.x.nix
View File

@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04"; sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04";
}; };
buildInputs = [ pkgconfig gettext perl libiconv zlib ]; buildInputs = [ pkgconfig gettext perl libiconv ];
propagatedBuildInputs = [ zlib ];
meta = { meta = {
description = "GLib, a C library of programming buildings blocks"; description = "GLib, a C library of programming buildings blocks";

4
pkgs/development/tools/misc/eggdbus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, zlib }: { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "eggdbus-0.6"; name = "eggdbus-0.6";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
}; };
buildInputs = [ pkgconfig glib dbus.libs dbus_glib zlib ]; buildInputs = [ pkgconfig glib dbus.libs dbus_glib ];
meta = { meta = {
homepage = http://hal.freedesktop.org/releases/; homepage = http://hal.freedesktop.org/releases/;

2
pkgs/top-level/all-packages.nix
View File

@ -3235,7 +3235,7 @@ let
}; };
eggdbus = import ../development/tools/misc/eggdbus { 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 { elfutils = import ../development/tools/misc/elfutils {