* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
parent 1e7d074f1d b786ce664d
commit bafc4ff59d
11 changed files with 61 additions and 23 deletions
@@ -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 = ''