public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "qemu-nix: Build statically" 

This reverts commit 5afa4f18d6.
This commit is contained in:
Eelco Dolstra 2015-06-01 20:49:35 +02:00
parent 18b5bd8dca
commit 4f60156afb
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/virtualization/qemu/default.nix
View File

@ -41,7 +41,7 @@ let
optLibuuid = if isNix then null else shouldUsePkg libuuid; optLibuuid = if isNix then null else shouldUsePkg libuuid;
optVde2 = if isNix then null else shouldUsePkg vde2; optVde2 = if isNix then null else shouldUsePkg vde2;
optLibaio = shouldUsePkg libaio; optLibaio = shouldUsePkg libaio;
optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng; optLibcap_ng = shouldUsePkg libcap_ng;
optSpice = if isNix then null else shouldUsePkg spice; optSpice = if isNix then null else shouldUsePkg spice;
optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol; optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol;
optLibceph = if isNix then null else shouldUsePkg libceph; optLibceph = if isNix then null else shouldUsePkg libceph;
@ -95,8 +95,6 @@ let
targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu"
else if stdenv.system == "i686-linux" then "i386-softmmu" else if stdenv.system == "i686-linux" then "i386-softmmu"
else null; else null;
hasModules = if isNix then null else true;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -140,7 +138,7 @@ stdenv.mkDerivation rec {
(mkOther "smbd" "smbd") (mkOther "smbd" "smbd")
(mkOther "sysconfdir" "/etc") (mkOther "sysconfdir" "/etc")
(mkOther "localstatedir" "/var") (mkOther "localstatedir" "/var")
(mkEnable hasModules "modules" null) (mkEnable true "modules" null)
(mkEnable false "debug-tcg" null) (mkEnable false "debug-tcg" null)
(mkEnable false "debug-info" null) (mkEnable false "debug-info" null)
(mkEnable false "sparse" null) (mkEnable false "sparse" null)
@ -169,7 +167,7 @@ stdenv.mkDerivation rec {
(mkEnable (!isNix) "system" null) (mkEnable (!isNix) "system" null)
(mkEnable (!isKvmOnly) "user" null) (mkEnable (!isKvmOnly) "user" null)
(mkEnable (!isKvmOnly) "guest-base" null) (mkEnable (!isKvmOnly) "guest-base" null)
(mkEnable (!isNix) "pie" null) (mkEnable true "pie" null)
(mkEnable (optLibuuid != null) "uuid" null) (mkEnable (optLibuuid != null) "uuid" null)
(mkEnable (optVde2 != null) "vde" null) (mkEnable (optVde2 != null) "vde" null)
(mkEnable false "netmap" null) # TODO(wkennington): Add Support (mkEnable false "netmap" null) # TODO(wkennington): Add Support
@ -201,8 +199,6 @@ stdenv.mkDerivation rec {
(mkEnable (optNumactl != null) "numa" null) (mkEnable (optNumactl != null) "numa" null)
] ++ optionals isKvmOnly [ ] ++ optionals isKvmOnly [
(mkOther "target-list" targetList) (mkOther "target-list" targetList)
] ++ optionals isNix [
"--static"
]; ];
installFlags = [ installFlags = [

7
pkgs/development/libraries/glib/default.nix
View File

@ -63,9 +63,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ pcre zlib libffi libiconv ] propagatedBuildInputs = [ pcre zlib libffi libiconv ]
++ libintlOrEmpty; ++ libintlOrEmpty;
# Static is necessary for qemu-nix to support static userspace translators configureFlags =
configureFlags = [ "--enable-static" ] optional stdenv.isDarwin "--disable-compile-warnings"
++ optional stdenv.isDarwin "--disable-compile-warnings"
++ optional stdenv.isSunOS "--disable-modular-tests"; ++ optional stdenv.isSunOS "--disable-modular-tests";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
@ -76,8 +75,6 @@ stdenv.mkDerivation rec {
export MACOSX_DEPLOYMENT_TARGET= export MACOSX_DEPLOYMENT_TARGET=
''; '';
dontDisableStatic = true;
enableParallelBuilding = true; enableParallelBuilding = true;
DETERMINISTIC_BUILD = 1; DETERMINISTIC_BUILD = 1;