Author: eelco
Date: Sun Apr 22 16:30:27 2012
New Revision: 33878
URL: https://nixos.org/websvn/nix/?rev=33878&sc=1
Log:
* Switch to QEMU/KVM 1.0.1.
Replaced:
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix
- copied unchanged from r33851,
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/1.0.nix
Deleted:
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/1.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied: nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix (from r33851,
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/1.0.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix Sun Apr 22
16:30:27 2012 (r33878, copy of r33851,
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/1.0.nix)
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid,
vde2
+, libjpeg, libpng, ncurses, python, glib }:
+
+assert stdenv.isLinux;
+
+let version = "1.0.1"; in
+
+stdenv.mkDerivation rec {
+ name = "qemu-kvm-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
+ sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
+ };
+
+ patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
+
+ postPatch =
+ '' for i in $(find kvm -type f)
+ do
+ sed -i "$i" \
+ -e 's|/bin/bash|/bin/sh|g ;
+ s|/usr/bin/python|${python}/bin/python|g ;
+ s|/bin/rm|rm|g'
+ done
+ '';
+
+ configureFlags =
+ [ "--audio-drv-list=alsa"
+ "--smbd=smbd" # use `smbd' from $PATH
+ ];
+
+ enableParallelBuilding = true;
+
+ buildInputs =
+ [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
+ ncurses python glib
+ ];
+
+ postInstall =
+ ''
+ # Libvirt expects us to be called `qemu-kvm'. Otherwise it will
+ # set the domain type to "qemu" rather than "kvm", which can
+ # cause architecture selection to misbehave.
+ ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
+ '';
+
+ meta = {
+ homepage = http://www.linux-kvm.org/;
+ description = "A full virtualization solution for Linux on x86 hardware
containing virtualization extensions";
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Apr 22 16:28:08
2012 (r33877)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Apr 22 16:30:27
2012 (r33878)
@@ -5998,7 +5998,6 @@
pwdutils = callPackage ../os-specific/linux/pwdutils { };
qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
- qemu_kvm_1_0 = callPackage ../os-specific/linux/qemu-kvm/1.0.nix { };
firmwareLinuxNonfree = callPackage
../os-specific/linux/firmware/firmware-linux-nonfree { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
