diff options
| -rw-r--r-- | machines/dnyarri.nix | 6 | ||||
| -rw-r--r-- | machines/mmrnmhrm.nix | 4 | ||||
| -rw-r--r-- | patch-vbox.nix | 13 |
3 files changed, 5 insertions, 18 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" 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"; - })); - }); -} |