diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2017-12-07 21:26:42 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2017-12-07 21:27:32 +0000 |
| commit | 7a92c2074dd6b003f3708db3de99b577e3b1f303 (patch) | |
| tree | 9bedc60099242890ea76d065d5802f30bb8b6570 /pkgs/applications/virtualization | |
| parent | f56b5824ad06cd03ebd1d1b9cf11a8db30dccb09 (diff) | |
| download | nixlib-7a92c2074dd6b003f3708db3de99b577e3b1f303.tar nixlib-7a92c2074dd6b003f3708db3de99b577e3b1f303.tar.gz nixlib-7a92c2074dd6b003f3708db3de99b577e3b1f303.tar.bz2 nixlib-7a92c2074dd6b003f3708db3de99b577e3b1f303.tar.lz nixlib-7a92c2074dd6b003f3708db3de99b577e3b1f303.tar.xz nixlib-7a92c2074dd6b003f3708db3de99b577e3b1f303.tar.zst nixlib-7a92c2074dd6b003f3708db3de99b577e3b1f303.zip | |
xen, qemu: passthru the path to qemu-system-i386
Diffstat (limited to 'pkgs/applications/virtualization')
| -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 2488bb1ae10e..b959832c9896 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -106,6 +106,10 @@ stdenv.mkDerivation rec { fi ''; + 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 308913adf89c..9a2ed6ee66b5 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -242,4 +242,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 259dd72a960c..bf4892ee3811 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -170,4 +170,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 |