diff options
| author | Peter Simons <simons@cryp.to> | 2013-07-30 11:29:30 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-07-30 11:29:30 +0200 |
| commit | 522acfd2f46c86afc651dc25e420c9cd2a86dd09 (patch) | |
| tree | be0784af7ec066c19a7d7a6804fb90e97d34e1ac /pkgs/development/libraries/glib | |
| parent | 0b8f1b1448539d4166573769931de48488af7a4c (diff) | |
| parent | af98eb8de0e06b86a07d8267fb52b4d07b65d5b9 (diff) | |
Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 12ce3fcc29b11..01b6795c48648 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi -, python, pcre, libelf }: +, python, pcre, libelf, libintlOrEmpty }: # TODO: # * Add gio-module-fam @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ libelf ]; + buildInputs = [ libelf ] ++ libintlOrEmpty; nativeBuildInputs = [ perl pkgconfig gettext python ]; @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + enableParallelBuilding = true; postInstall = ''rm -rvf $out/share/gtk-doc''; |