diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-04 17:44:44 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-04 18:27:26 +0200 |
| commit | d199fe766a6f96d8739b5e8d1a9d9211d5f795e8 (patch) | |
| tree | 165c27584fd5edbb18f8067c3f687def932e1440 | |
| parent | e638620100989bc00d645fd4ff0641766cb3e108 (diff) | |
| download | nixlib-d199fe766a6f96d8739b5e8d1a9d9211d5f795e8.tar nixlib-d199fe766a6f96d8739b5e8d1a9d9211d5f795e8.tar.gz nixlib-d199fe766a6f96d8739b5e8d1a9d9211d5f795e8.tar.bz2 nixlib-d199fe766a6f96d8739b5e8d1a9d9211d5f795e8.tar.lz nixlib-d199fe766a6f96d8739b5e8d1a9d9211d5f795e8.tar.xz nixlib-d199fe766a6f96d8739b5e8d1a9d9211d5f795e8.tar.zst nixlib-d199fe766a6f96d8739b5e8d1a9d9211d5f795e8.zip | |
qemu: Merge stuff from qemu-kvm
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bfbc9a8ab729..91d803fb026a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -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/; |