diff options
author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-07-04 14:54:20 +1000 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2013-07-12 16:26:44 +0200 |
commit | 8c54b95273cd97d87c3372d53b9c820da9394927 (patch) | |
tree | 1d5eefdeb4ccc0e3fda1a4bd2e3fd1ff44afa31d /pkgs/development/libraries/glib | |
parent | 8ac7701c4cc0538108430b7f9a7b3bdd787df29d (diff) |
glib: fix build on darwin
* add libintlOrEmpty to build inputs * add -lintl to CFLAGS
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 b500967af78e7..b5e2b1e43b215 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 ]; @@ -43,6 +43,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''; |