public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu: add xen support

Browse Source
This commit is contained in:
Jan Malakhovski 2016-11-02 16:06:48 +00:00
parent eff9b09fb7
commit 1c8940a2b8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/virtualization/qemu/default.nix
View File

@ -11,6 +11,7 @@
, vncSupport ? true, libjpeg, libpng , vncSupport ? true, libjpeg, libpng
, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol
, usbredirSupport ? spiceSupport, usbredir , usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen
, x86Only ? false , x86Only ? false
, nixosTestRunner ? false , nixosTestRunner ? false
}: }:
@ -25,6 +26,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qemu-" name = "qemu-"
+ stdenv.lib.optionalString xenSupport "xen-"
+ stdenv.lib.optionalString x86Only "x86-only-" + stdenv.lib.optionalString x86Only "x86-only-"
+ stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+ version; + version;
@ -47,7 +49,8 @@ stdenv.mkDerivation rec {
++ optionals vncSupport [ libjpeg libpng ] ++ optionals vncSupport [ libjpeg libpng ]
++ optionals spiceSupport [ spice_protocol spice ] ++ optionals spiceSupport [ spice_protocol spice ]
++ optionals usbredirSupport [ usbredir ] ++ optionals usbredirSupport [ usbredir ]
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -100,7 +103,8 @@ stdenv.mkDerivation rec {
++ optional usbredirSupport "--enable-usb-redir" ++ optional usbredirSupport "--enable-usb-redir"
++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isDarwin "--enable-cocoa"
++ optional stdenv.isLinux "--enable-linux-aio"; ++ optional stdenv.isLinux "--enable-linux-aio"
++ optional xenSupport "--enable-xen";
postFixup = postFixup =
'' ''

2
pkgs/top-level/all-packages.nix
View File

@ -11892,6 +11892,8 @@ with pkgs;
watch = callPackage ../os-specific/linux/procps/watch.nix { }; watch = callPackage ../os-specific/linux/procps/watch.nix { };
qemu_kvm = lowPrio (qemu.override { x86Only = true; }); qemu_kvm = lowPrio (qemu.override { x86Only = true; });
qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; });
qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; });
firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };