diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2017-12-07 21:26:42 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-09 19:51:07 +0000 |
| commit | 06adc17455257324ae555bb1544643ee3a42d313 (patch) | |
| tree | 033541ca9ca6e734fbcfc9e40321d8d282d3b558 | |
| parent | e5268344feedd21ad1f59c43fea28be49d27e347 (diff) | |
xen, qemu: passthru the path to qemu-system-i386
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/xen/4.5.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/xen/4.8.nix | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 91b02f7ad1f0d..68ab979ecfbe1 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -101,6 +101,10 @@ stdenv.mkDerivation rec { else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; + passthru = { + qemu-system-i386 = "bin/qemu-system-i386"; + }; + meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index ec3fe9ccf221a..22799a7af8e79 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -248,4 +248,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) ({ ocamlPackages = ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 6eedca18960b3..44a52a1026afc 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -176,4 +176,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) args |