Merge pull request #32424 from oxij/nixos/related-packages

nixos: doc: implement related packages in the manual
This commit is contained in:
Arseniy Seroka
2017-12-23 03:34:58 +03:00
committed by GitHub
12 changed files with 133 additions and 26 deletions
@@ -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";
@@ -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)
@@ -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