diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2017-12-23 03:34:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-23 03:34:58 +0300 |
| commit | 36e02645eba174dd6a76aaebc62b5095bb7005a9 (patch) | |
| tree | 4d37dda40510984edef81b7d15567e8e6ece39a1 /pkgs | |
| parent | d0bb0a2c538dbe84189da00848dd1f8d5e0deda3 (diff) | |
| parent | 3be0e1bd728f2500f1e8543ebc121d3ba9dabb4d (diff) | |
| download | nixlib-36e02645eba174dd6a76aaebc62b5095bb7005a9.tar nixlib-36e02645eba174dd6a76aaebc62b5095bb7005a9.tar.gz nixlib-36e02645eba174dd6a76aaebc62b5095bb7005a9.tar.bz2 nixlib-36e02645eba174dd6a76aaebc62b5095bb7005a9.tar.lz nixlib-36e02645eba174dd6a76aaebc62b5095bb7005a9.tar.xz nixlib-36e02645eba174dd6a76aaebc62b5095bb7005a9.tar.zst nixlib-36e02645eba174dd6a76aaebc62b5095bb7005a9.zip | |
Merge pull request #32424 from oxij/nixos/related-packages
nixos: doc: implement related packages in the manual
Diffstat (limited to 'pkgs')
| -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 91b02f7ad1f0..68ab979ecfbe 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 ec3fe9ccf221..22799a7af8e7 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 6eedca18960b..44a52a1026af 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 |