diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:49:35 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:47 +0200 |
| commit | 4f60156afbb8d61d8d28db8ab594ec9328946d71 (patch) | |
| tree | e9f4d3843940f0e27f50ea4aac701f72ccd79d39 /pkgs | |
| parent | 18b5bd8dcac19e040b34dd6393ac3bdf757c3566 (diff) | |
| download | nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.gz nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.bz2 nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.lz nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.xz nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.tar.zst nixpkgs-4f60156afbb8d61d8d28db8ab594ec9328946d71.zip | |
Revert "qemu-nix: Build statically"
This reverts commit 5afa4f18d6173725d593e59f1c4a8f54b575f9fe.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f04ff311930..0d57a8d9f57 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -41,7 +41,7 @@ let optLibuuid = if isNix then null else shouldUsePkg libuuid; optVde2 = if isNix then null else shouldUsePkg vde2; 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_protocol = if isNix then null else shouldUsePkg spice_protocol; 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" else if stdenv.system == "i686-linux" then "i386-softmmu" else null; - - hasModules = if isNix then null else true; in stdenv.mkDerivation rec { @@ -140,7 +138,7 @@ stdenv.mkDerivation rec { (mkOther "smbd" "smbd") (mkOther "sysconfdir" "/etc") (mkOther "localstatedir" "/var") - (mkEnable hasModules "modules" null) + (mkEnable true "modules" null) (mkEnable false "debug-tcg" null) (mkEnable false "debug-info" null) (mkEnable false "sparse" null) @@ -169,7 +167,7 @@ stdenv.mkDerivation rec { (mkEnable (!isNix) "system" null) (mkEnable (!isKvmOnly) "user" null) (mkEnable (!isKvmOnly) "guest-base" null) - (mkEnable (!isNix) "pie" null) + (mkEnable true "pie" null) (mkEnable (optLibuuid != null) "uuid" null) (mkEnable (optVde2 != null) "vde" null) (mkEnable false "netmap" null) # TODO(wkennington): Add Support @@ -201,8 +199,6 @@ stdenv.mkDerivation rec { (mkEnable (optNumactl != null) "numa" null) ] ++ optionals isKvmOnly [ (mkOther "target-list" targetList) - ] ++ optionals isNix [ - "--static" ]; installFlags = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 518d713026a..7d61bea64e1 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; |