diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-09-20 03:36:07 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-09-20 03:45:45 +0200 |
| commit | b7eeaf28ffa881ee71c65c6b6000c4593d6cbe22 (patch) | |
| tree | b1c7f81f325b2f5e68af739ca9ef784766ab39b0 /machines | |
| parent | ba093a29001d0cd53cff1a315b0694f5f2476846 (diff) | |
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>
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/dnyarri.nix | 6 | ||||
| -rw-r--r-- | machines/mmrnmhrm.nix | 4 |
2 files changed, 5 insertions, 5 deletions
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" |