Author: ludo Date: Mon Feb 27 23:25:54 2012 New Revision: 32637 URL: https://nixos.org/websvn/nix/?rev=32637&sc=1
Log: QEMU-KVM 1.0 (tentative). Added: nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/1.0.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Added: 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/1.0.nix Mon Feb 27 23:25:54 2012 (r32637) @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 +, libjpeg, libpng, ncurses, python, glib }: + +assert stdenv.isLinux; + +let version = "1.0"; in +stdenv.mkDerivation rec { + name = "qemu-kvm-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; + sha256 = "0vhigv9r9yrhph4wc4mhg99a683iwf121kjigqzg92x2l3ayl4dp"; + }; + + 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 Mon Feb 27 22:53:44 2012 (r32636) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 27 23:25:54 2012 (r32637) @@ -6043,6 +6043,7 @@ 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 nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits