From 4f60156afbb8d61d8d28db8ab594ec9328946d71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 20:49:35 +0200 Subject: Revert "qemu-nix: Build statically" This reverts commit 5afa4f18d6173725d593e59f1c4a8f54b575f9fe. --- pkgs/development/libraries/glib/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 518d713026ab..7d61bea64e11 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; -- cgit 1.4.1