Revert "qemu-nix: Build statically"

This reverts commit 5afa4f18d6.
2015-06-01 20:49:35 +02:00
parent 18b5bd8dca
commit 4f60156afb
2 changed files with 5 additions and 12 deletions
--- 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;