diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-08-25 11:10:55 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-08-25 11:10:55 +0200 |
| commit | 6fc58460ca5d7cce451aaea37ba8051b37c1bc0c (patch) | |
| tree | 0407cc7fa8f6a2b46e0522a03c40c672d5e2f49e | |
| parent | 2c887868f682f1d0e16d83fb3be8c54b5e2193e2 (diff) | |
Dirty hack to patch VirtualBox for kernel 3.17.
Really, I haven't even tested if this builds, because a build process is hanging in zombie-"mode" right now. And I really don't want to reboot twice, so let's throw it at Hydra and hope everything works well, right? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | machines/dnyarri.nix | 3 | ||||
| -rw-r--r-- | machines/mmrnmhrm.nix | 4 | ||||
| -rw-r--r-- | patch-vbox.nix | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix index f620307a..c9650ee7 100644 --- a/machines/dnyarri.nix +++ b/machines/dnyarri.nix @@ -74,7 +74,8 @@ with import ../lib; }; in rec { kernelPackages = let - kpkgs = pkgs.linuxPackagesFor linuxVuizvui kernelPackages; + kpkgs = import ../patch-vbox.nix pkgs + (pkgs.linuxPackagesFor linuxVuizvui kernelPackages); virtualbox = kpkgs.virtualbox.override { enableExtensionPack = true; }; diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix index 29b72699..240b6d0f 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/mmrnmhrm.nix @@ -17,8 +17,8 @@ with import ../lib; allowImportFromDerivation = true; }; in rec { - kernelPackages = pkgs.recurseIntoAttrs - (pkgs.linuxPackagesFor linuxVuizvui kernelPackages); + kernelPackages = pkgs.recurseIntoAttrs (import ../patch-vbox.nix pkgs + (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 new file mode 100644 index 00000000..5d944689 --- /dev/null +++ b/patch-vbox.nix @@ -0,0 +1,13 @@ +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"; + })); + }); +} |