From b7eeaf28ffa881ee71c65c6b6000c4593d6cbe22 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 20 Sep 2014 03:36:07 +0200
Subject: Revert VirtualBox kernel patch for version 3.17.

No longer needed for VirtualBox 3.16.

This reverts the following commits:

 * 6fc58460ca5d7cce451aaea37ba8051b37c1bc0c
 * 62e2dce98704681cafe67b06e18d3e5ffa037d88

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/dnyarri.nix  |  6 +++---
 machines/mmrnmhrm.nix |  4 ++--
 patch-vbox.nix        | 13 -------------
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 patch-vbox.nix

diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix
index cdc662fc..202c0541 100644
--- a/machines/dnyarri.nix
+++ b/machines/dnyarri.nix
@@ -74,12 +74,12 @@ with import ../lib;
     };
   in rec {
     kernelPackages = let
-      kpkgs = pkgs.linuxPackagesFor linuxVuizvui kernelPackages;
+      kpkgs = pkgs.recurseIntoAttrs
+        (pkgs.linuxPackagesFor linuxVuizvui kernelPackages);
       virtualbox = kpkgs.virtualbox.override {
         enableExtensionPack = true;
       };
-      patcher = import ../patch-vbox.nix pkgs;
-    in pkgs.recurseIntoAttrs (patcher (kpkgs // { inherit virtualbox; }));
+    in pkgs.recurseIntoAttrs (kpkgs // { inherit virtualbox; });
     inherit kernelParams;
 
     initrd = {
diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix
index 240b6d0f..29b72699 100644
--- a/machines/mmrnmhrm.nix
+++ b/machines/mmrnmhrm.nix
@@ -17,8 +17,8 @@ with import ../lib;
       allowImportFromDerivation = true;
     };
   in rec {
-    kernelPackages = pkgs.recurseIntoAttrs (import ../patch-vbox.nix pkgs
-      (pkgs.linuxPackagesFor linuxVuizvui kernelPackages));
+    kernelPackages = pkgs.recurseIntoAttrs
+      (pkgs.linuxPackagesFor linuxVuizvui kernelPackages);
 
     loader.grub.devices = map (i: "/dev/disk/by-id/${i}") [
       "ata-WDC_WD10EZEX-00BN5A0_WD-WCC3F5756955"
diff --git a/patch-vbox.nix b/patch-vbox.nix
deleted file mode 100644
index 5d944689..00000000
--- a/patch-vbox.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-pkgs: kpkgs:
-
-with pkgs.lib;
-
-kpkgs // {
-  virtualbox = overrideDerivation kpkgs.virtualbox (o: {
-    patches = (o.patches or []) ++ (singleton (pkgs.fetchurl {
-      name = "virtualbox-fix-linux-3.17.patch";
-      url = "https://forums.virtualbox.org/download/file.php?id=13399";
-      sha256 = "01ngbcdpc3h0ryvjzl2hdw5fp4141k9f56bqy8y6sh56mamyj9q7";
-    }));
-  });
-}
-- 
cgit 1.4.1