Merge branch 'master' into staging

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;