From 1bc803cb0954186f21bda845337ec6ed00ca1b9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Jan 2012 21:43:17 +0000 Subject: [PATCH] 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 --- pkgs/development/libraries/glib/2.28.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index 3b7f8b18495d..31ebe207a395 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 = ''