* qemu-kvm is the upstream renaming of the kvm package. It no longer

  contains the kernel module, which we didn't build anyway.  The kvm
  package can be deleted eventually.

svn path=/nixpkgs/trunk/; revision=16582

2 files changed, 37 insertions, 0 deletions

diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
new file mode 100644
index 00000000000..112ea0fa931
--- /dev/null
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils}:
+   
+assert stdenv.isLinux;
+   
+stdenv.mkDerivation rec {
+  name = "qemu-kvm-0.11.0-rc1";
+   
+  src = fetchurl {
+    url = "mirror://sourceforge/kvm/${name}.tar.gz";
+    sha256 = "0gmz42ckjjv6p9fd767k1sqh319aplsddschjp86m526d082rik9";
+  };
+
+  # e2fsprogs is needed for libuuid.
+  # rsync is a weird dependency used for copying kernel header files.
+  buildInputs = [zlib SDL alsaLib pkgconfig pciutils];
+
+  preBuild =
+    ''
+      # Don't use a hardcoded path to Samba.
+      substituteInPlace ./net.h --replace /usr/sbin/smbd smbd
+    '';
+  
+  postInstall =
+    ''
+      # extboot.bin isn't installed due to a bug in the Makefile.
+      cp pc-bios/optionrom/extboot.bin $out/share/qemu/
+    '';
+
+  meta = {
+    homepage = http://www.linux-kvm.org/;
+    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3db109f6f3..93f40efdd54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5415,6 +5415,10 @@ let
     inherit fetchurl stdenv pam openssl libnscd;
   };
 
+  qemu_kvm = import ../os-specific/linux/qemu-kvm {
+    inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
+  };
+
   reiserfsprogs = import ../os-specific/linux/reiserfsprogs {
     inherit fetchurl stdenv;
   };