diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:30:46 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:30:46 +0100 |
| commit | fd48a94b62592c68e7d66329ba33930d3cfe3f37 (patch) | |
| tree | 4230272708eb350a36c29c08cac98e159d5e65a9 /pkgs/applications/virtualization | |
| parent | a0eb6c1f81e1d294726c644ff47f1e851afb2f10 (diff) | |
| parent | 6fe10d27799c284c72876f792c7b12d7fa54602b (diff) | |
| download | nixpkgs-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar nixpkgs-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.gz nixpkgs-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.bz2 nixpkgs-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.lz nixpkgs-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.xz nixpkgs-fd48a94b62592c68e7d66329ba33930d3cfe3f37.tar.zst nixpkgs-fd48a94b62592c68e7d66329ba33930d3cfe3f37.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 301a9211cf6..67a863b6fb7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -3,7 +3,7 @@ , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper , attr, libcap, libcap_ng -, CoreServices, Cocoa, rez, setfile +, CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { vde2 texinfo flex bison makeWrapper lzo snappy gnutls nettle curl ] - ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] + ++ optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] ++ optionals seccompSupport [ libseccomp ] ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { ++ optional usbredirSupport "--enable-usb-redir" ++ optional (hostCpuTargets != null) "--target-list=${stdenv.lib.concatStringsSep "," hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" + ++ optional stdenv.isDarwin "--enable-hvf" ++ optional stdenv.isLinux "--enable-linux-aio" ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 828db24c325..8304dd15597 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 +{ config, stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 , libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap , libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 @@ -7,7 +7,7 @@ , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null , extensionPack ? null, fakeroot ? null -, pulseSupport ? false, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , enableHardening ? false , headless ? false , enable32bitGuests ? true |