qemu: Merge stuff from qemu-kvm

This commit is contained in:
Eelco Dolstra 2013-07-04 17:44:44 +02:00
parent e638620100
commit d199fe766a

View File

@ -1,5 +1,9 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
, attr, libcap, vde2 }: , attr, libcap, vde2, alsaLib, texinfo, libuuid
, sdlSupport ? true, SDL
, vncSupport ? true, libjpeg, libpng
, spiceSupport ? false, spice, spice_protocol
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qemu-1.5.1"; name = "qemu-1.5.1";
@ -9,17 +13,21 @@ stdenv.mkDerivation rec {
sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac"; sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac";
}; };
buildInputs = [ buildInputs =
python zlib pkgconfig glib SDL ncurses perl pixman attr libcap [ python zlib pkgconfig glib ncurses perl pixman attr libcap
vde2 vde2 alsaLib texinfo libuuid
]; ]
++ stdenv.lib.optionals sdlSupport [ SDL ]
++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = [ configureFlags =
"--enable-virtfs" [ "--audio-drv-list=alsa"
"--enable-vde" "--smbd=smbd" # use `smbd' from $PATH
]; ]
++ stdenv.lib.optional spiceSupport "--enable-spice";
meta = { meta = {
homepage = http://www.qemu.org/; homepage = http://www.qemu.org/;