Revert "qemu-nix: Build statically"

This reverts commit 5afa4f18d6173725d593e59f1c4a8f54b575f9fe.

+5 -12
+3 -7
pkgs/applications/virtualization/qemu/default.nix
··· 41 41 optLibuuid = if isNix then null else shouldUsePkg libuuid; 42 42 optVde2 = if isNix then null else shouldUsePkg vde2; 43 43 optLibaio = shouldUsePkg libaio; 44 - optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng; 44 + optLibcap_ng = shouldUsePkg libcap_ng; 45 45 optSpice = if isNix then null else shouldUsePkg spice; 46 46 optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol; 47 47 optLibceph = if isNix then null else shouldUsePkg libceph; ··· 95 95 targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" 96 96 else if stdenv.system == "i686-linux" then "i386-softmmu" 97 97 else null; 98 - 99 - hasModules = if isNix then null else true; 100 98 in 101 99 102 100 stdenv.mkDerivation rec { ··· 140 138 (mkOther "smbd" "smbd") 141 139 (mkOther "sysconfdir" "/etc") 142 140 (mkOther "localstatedir" "/var") 143 - (mkEnable hasModules "modules" null) 141 + (mkEnable true "modules" null) 144 142 (mkEnable false "debug-tcg" null) 145 143 (mkEnable false "debug-info" null) 146 144 (mkEnable false "sparse" null) ··· 169 167 (mkEnable (!isNix) "system" null) 170 168 (mkEnable (!isKvmOnly) "user" null) 171 169 (mkEnable (!isKvmOnly) "guest-base" null) 172 - (mkEnable (!isNix) "pie" null) 170 + (mkEnable true "pie" null) 173 171 (mkEnable (optLibuuid != null) "uuid" null) 174 172 (mkEnable (optVde2 != null) "vde" null) 175 173 (mkEnable false "netmap" null) # TODO(wkennington): Add Support ··· 201 199 (mkEnable (optNumactl != null) "numa" null) 202 200 ] ++ optionals isKvmOnly [ 203 201 (mkOther "target-list" targetList) 204 - ] ++ optionals isNix [ 205 - "--static" 206 202 ]; 207 203 208 204 installFlags = [
+2 -5
pkgs/development/libraries/glib/default.nix
··· 63 63 propagatedBuildInputs = [ pcre zlib libffi libiconv ] 64 64 ++ libintlOrEmpty; 65 65 66 - # Static is necessary for qemu-nix to support static userspace translators 67 - configureFlags = [ "--enable-static" ] 68 - ++ optional stdenv.isDarwin "--disable-compile-warnings" 66 + configureFlags = 67 + optional stdenv.isDarwin "--disable-compile-warnings" 69 68 ++ optional stdenv.isSunOS "--disable-modular-tests"; 70 69 71 70 NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" ··· 75 74 '' 76 75 export MACOSX_DEPLOYMENT_TARGET= 77 76 ''; 78 - 79 - dontDisableStatic = true; 80 77 81 78 enableParallelBuilding = true; 82 79 DETERMINISTIC_BUILD = 1;