From f137e917004ec7ff07624a76f89ce91ee8e0097e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 20 Jun 2012 16:46:15 +0200
Subject: [PATCH] virtualbox: Fix build for kernel 3.5.0.

This adds two patches from the current SVN trunk to fix build with the changes
introduced in latest -rc versions of kernel 3.5.0.
---
 .../virtualization/virtualbox/default.nix       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1e17c10ffd26b..e4cf962b41039 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     ++ optional javaBindings jdk
     ++ optional pythonBindings python;
 
-  patchPhase = ''
+  postPatch = ''
     set -x
     MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
     sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
@@ -41,6 +41,21 @@ stdenv.mkDerivation {
     set +x
   '';
 
+  patches = [
+    (fetchurl {
+      name = "fix-build-with-3.5-rc2";
+      url = "https://www.virtualbox.org/changeset/41660/vbox?format=diff&new=41660";
+      sha256 = "661f9e9b0e0fc5689d7a2c6511c670596046df7d1f75042b8cc70d8392239ad5";
+    })
+    (fetchurl {
+      name = "fix-build-with-3.5-rc3";
+      url = "https://www.virtualbox.org/changeset/41577/vbox?format=diff&new=41577";
+      sha256 = "a20c9a810b4b478fcdb38d495dff0a49df27463ffe1e4aa96deb6dd328f18f55";
+    })
+  ];
+
+  patchFlags = "-p2";
+
   configurePhase = ''
     ./configure --with-qt4-dir=${qt4} \
       ${optionalString (!javaBindings) "--disable-java"} \