diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-31 14:31:04 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-31 14:53:34 +0200 |
| commit | 00e311e43878414a3c5f88cabd5a81cd8537c59f (patch) | |
| tree | a1b650374eb1884611d14a23f33d62fab48be8d4 /pkgs/applications/virtualization | |
| parent | 945c70202f71e452ad957a1e073d7b3269f9401c (diff) | |
| download | nixlib-00e311e43878414a3c5f88cabd5a81cd8537c59f.tar nixlib-00e311e43878414a3c5f88cabd5a81cd8537c59f.tar.gz nixlib-00e311e43878414a3c5f88cabd5a81cd8537c59f.tar.bz2 nixlib-00e311e43878414a3c5f88cabd5a81cd8537c59f.tar.lz nixlib-00e311e43878414a3c5f88cabd5a81cd8537c59f.tar.xz nixlib-00e311e43878414a3c5f88cabd5a81cd8537c59f.tar.zst nixlib-00e311e43878414a3c5f88cabd5a81cd8537c59f.zip | |
qemu-kvm: Remove
But install a qemu-kvm wrapper in qemu.
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e1ae4df44439..3a6cdb6f8c60 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman , attr, libcap, vde2, alsaLib, texinfo, libuuid +, makeWrapper , sdlSupport ? true, SDL , vncSupport ? true, libjpeg, libpng , spiceSupport ? true, spice, spice_protocol @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 alsaLib texinfo libuuid + vde2 alsaLib texinfo libuuid makeWrapper ] ++ stdenv.lib.optionals sdlSupport [ SDL ] ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ] @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional spiceSupport "--enable-spice" ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"; + postInstall = + '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "-enable-kvm" + fi + ''; + meta = { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; |