* KVM 57. (Newer versions don't compile against the current kernel headers.)

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

2 files changed, 31 insertions, 1 deletions

diff --git a/pkgs/os-specific/linux/kvm/57.nix b/pkgs/os-specific/linux/kvm/57.nix
new file mode 100644
index 000000000000..c7859eed178e
--- /dev/null
+++ b/pkgs/os-specific/linux/kvm/57.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib}:
+   
+assert stdenv.isLinux;
+   
+stdenv.mkDerivation {
+  name = "kvm-57";
+   
+  src = fetchurl {
+    url = mirror://sourceforge/kvm/kvm-57.tar.gz;
+    sha256 = "016h5pf59fyz7skzsaprii2mdpxpb8hfnnr1w475qcfyy6ccr9r0";
+  };
+
+  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
+
+  # e2fsprogs is needed for libuuid.
+  buildInputs = [zlib e2fsprogs SDL alsaLib];
+
+  preConfigure = "for i in configure user/configure; do substituteInPlace $i --replace /bin/bash $shell; done";
+
+  meta = {
+    homepage = http://kvm.qumranet.com/;
+    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 09191954ec01..030feebdd77f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3728,7 +3728,7 @@ rec {
 	kernel = systemKernel;
   };
 
-  kvm = kvm49;
+  kvm = kvm57;
 
   kvm12 = import ../os-specific/linux/kvm/12.nix {
     inherit fetchurl zlib e2fsprogs SDL alsaLib;
@@ -3748,6 +3748,12 @@ rec {
     kernelHeaders = kernelHeaders_2_6_23;
   };
 
+  kvm57 = import ../os-specific/linux/kvm/57.nix {
+    inherit fetchurl zlib e2fsprogs SDL alsaLib;
+    stdenv = overrideGCC stdenv gcc34;
+    kernelHeaders = kernelHeaders_2_6_23;
+  };
+
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv;
   };