diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-02-14 22:19:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 22:19:40 +0100 |
| commit | 9edf7609ecd066d25a0083dfbea03ff4460d93ed (patch) | |
| tree | a653c23e3a81927daacf41c04bfc9c981f99295f /pkgs/applications/virtualization | |
| parent | 7c860b5fd8e7e721c99ceaf4bcf61b70cfe22768 (diff) | |
| parent | 355d9a63782567f5f748601f970d0ff6c3898fef (diff) | |
| download | nixlib-9edf7609ecd066d25a0083dfbea03ff4460d93ed.tar nixlib-9edf7609ecd066d25a0083dfbea03ff4460d93ed.tar.gz nixlib-9edf7609ecd066d25a0083dfbea03ff4460d93ed.tar.bz2 nixlib-9edf7609ecd066d25a0083dfbea03ff4460d93ed.tar.lz nixlib-9edf7609ecd066d25a0083dfbea03ff4460d93ed.tar.xz nixlib-9edf7609ecd066d25a0083dfbea03ff4460d93ed.tar.zst nixlib-9edf7609ecd066d25a0083dfbea03ff4460d93ed.zip | |
Merge pull request #55668 from bwolf/qemu-darwin-hvf
qemu: Add support for the Hypervisor framework on Darwin
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 301a9211cf65..67a863b6fb7c 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" |