diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:49:35 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:47 +0200 |
| commit | 4f60156afbb8d61d8d28db8ab594ec9328946d71 (patch) | |
| tree | e9f4d3843940f0e27f50ea4aac701f72ccd79d39 /pkgs/development/libraries | |
| parent | 18b5bd8dcac19e040b34dd6393ac3bdf757c3566 (diff) | |
| download | nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.gz nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.bz2 nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.lz nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.xz nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.zst nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.zip | |
Revert "qemu-nix: Build statically"
This reverts commit 5afa4f18d6173725d593e59f1c4a8f54b575f9fe.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 518d713026a..7d61bea64e1 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -63,9 +63,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pcre zlib libffi libiconv ] ++ libintlOrEmpty; - # Static is necessary for qemu-nix to support static userspace translators - configureFlags = [ "--enable-static" ] - ++ optional stdenv.isDarwin "--disable-compile-warnings" + configureFlags = + optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isSunOS "--disable-modular-tests"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" @@ -76,8 +75,6 @@ stdenv.mkDerivation rec { export MACOSX_DEPLOYMENT_TARGET= ''; - dontDisableStatic = true; - enableParallelBuilding = true; DETERMINISTIC_BUILD = 1; |