mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
qemu: Merge stuff from qemu-kvm
This commit is contained in:
parent
e638620100
commit
d199fe766a
1 changed files with 18 additions and 10 deletions
|
@ -1,5 +1,9 @@
|
|||
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman
|
||||
, attr, libcap, vde2 }:
|
||||
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
|
||||
, attr, libcap, vde2, alsaLib, texinfo, libuuid
|
||||
, sdlSupport ? true, SDL
|
||||
, vncSupport ? true, libjpeg, libpng
|
||||
, spiceSupport ? false, spice, spice_protocol
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qemu-1.5.1";
|
||||
|
@ -9,17 +13,21 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python zlib pkgconfig glib SDL ncurses perl pixman attr libcap
|
||||
vde2
|
||||
];
|
||||
buildInputs =
|
||||
[ python zlib pkgconfig glib ncurses perl pixman attr libcap
|
||||
vde2 alsaLib texinfo libuuid
|
||||
]
|
||||
++ stdenv.lib.optionals sdlSupport [ SDL ]
|
||||
++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
|
||||
++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--enable-virtfs"
|
||||
"--enable-vde"
|
||||
];
|
||||
configureFlags =
|
||||
[ "--audio-drv-list=alsa"
|
||||
"--smbd=smbd" # use `smbd' from $PATH
|
||||
]
|
||||
++ stdenv.lib.optional spiceSupport "--enable-spice";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.qemu.org/;
|
||||
|
|
Loading…
Reference in a new issue