* KVM (Kernel-based Virtual Machine). Requires KVM support in the

  kernel for performance (and VT/AMD-V in the CPU), but also provides
  a working QEMU for non-KVM-enabled systems.

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

1 files changed, 12 insertions, 0 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 570d6d15e7bb..3449d4d2baca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2173,6 +2173,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  kernelHeaders_2_6_20 = import ../os-specific/linux/kernel-headers/2.6.20.nix {
+    inherit fetchurl stdenv;
+  };
+
   kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "arm-linux";
@@ -2263,6 +2267,14 @@ rec {
     inherit fetchurl stdenv perl bison mktemp kernel;
   };
 
+  kvm = kvm12;
+
+  kvm12 = import ../os-specific/linux/kvm/12.nix {
+    inherit fetchurl zlib e2fsprogs SDL alsaLib;
+    stdenv = overrideGCC stdenv gcc34;
+    kernelHeaders = kernelHeaders_2_6_20;
+  };
+
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv;
   };