diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 15:29:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 15:29:04 +0000 |
| commit | bafc4ff59d1547aa0437e3aba1eab6fb0a7f4d21 (patch) | |
| tree | d4193addcfc3c73d0f5189d5dc0934b05200c656 /pkgs/development/libraries/glib | |
| parent | 1e7d074f1d15393d07281e1b36b8d6b3b6445b1c (diff) | |
| parent | b786ce664df777fc5e061a2d670306ee54b25615 (diff) | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
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 dd613c6ce3c18..e41917b3fe46a 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 ]; - propagatedBuildInputs = [ zlib ]; + propagatedBuildInputs = [ zlib ] + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; # glib buildsystem fails to find python, thus hardcodes python2.4 in #! postInstall = '' |