diff options
| author | Peter Simons <simons@cryp.to> | 2012-01-19 21:43:17 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-01-19 21:43:17 +0000 |
| commit | 1bc803cb0954186f21bda845337ec6ed00ca1b9f (patch) | |
| tree | 9ade0407276ae5d25f4f37f40653f3b32c02e70a /pkgs/development/libraries/glib | |
| parent | e2633477c0d797aabaf96f2d393a6a6c6f7c2e90 (diff) | |
glib-2.28.x: blind commit that hopefully fixes a lot of build errors on Darwin
It appears that users of glibc expect to be able to link libintl via pkgconfig. On Linux, this always works because that library comes with glibc, but on other platforms gettext is required to fulfill the dependency. I don't have access to Darwin, so I cannot actually test this change. If any runs into problems because of this modification, please feel free to revert it! svn path=/nixpkgs/trunk/; revision=31723
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/2.28.x.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index 3b7f8b18495de..31ebe207a3951 100644 --- a/pkgs/development/libraries/glib/2.28.x.nix +++ b/pkgs/development/libraries/glib/2.28.x.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; buildNativeInputs = [ perl pkgconfig gettext xz ]; - propagatedBuildInputs = [ zlib ]; + propagatedBuildInputs = [ zlib ] + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; # glib buildsystem fails to find python, thus hardcodes python2.4 in #! postInstall = '' |