diff options
| author | Domen Kožar <domen@dev.si> | 2015-06-01 11:00:51 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-06-01 11:00:51 +0200 |
| commit | dc3316268ecfe7d7e2b44ed7080212f3824124b9 (patch) | |
| tree | c176330237584330a46d40cc32a4e3ceea8fdfe6 /pkgs/development/libraries/glib | |
| parent | 867d2c5c464fd87268f71942beded17d7e1e5b9c (diff) | |
| parent | 5afa4f18d6173725d593e59f1c4a8f54b575f9fe (diff) | |
| download | nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.gz nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.bz2 nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.lz nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.xz nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.tar.zst nixlib-dc3316268ecfe7d7e2b44ed7080212f3824124b9.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 5c76bc3186ba..8dc96dbbe7a1 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -63,8 +63,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pcre zlib libffi libiconv ] ++ libintlOrEmpty; - configureFlags = - optional stdenv.isDarwin "--disable-compile-warnings" + # Static is necessary for qemu-nix to support static userspace translators + configureFlags = [ "--enable-static" ] + ++ optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isSunOS "--disable-modular-tests"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" @@ -75,6 +76,8 @@ stdenv.mkDerivation rec { export MACOSX_DEPLOYMENT_TARGET= ''; + dontDisableStatic = true; + enableParallelBuilding = true; DETERMINISTIC_BUILD = 1; |