about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/virtualbox/guest-additions
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-07-04 20:04:45 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-07-04 20:08:42 +0200
commit12ee0fbd8883cb5a17b499c42c8d6cdf602d1640 (patch)
treeb22edc2c00366c0748b4416f194ed57a3858bdd9 /pkgs/applications/virtualization/virtualbox/guest-additions
parentf873ba8cc8bb69b57913f2468f0dd78ddbeb427d (diff)
downloadnixlib-12ee0fbd8883cb5a17b499c42c8d6cdf602d1640.tar
nixlib-12ee0fbd8883cb5a17b499c42c8d6cdf602d1640.tar.gz
nixlib-12ee0fbd8883cb5a17b499c42c8d6cdf602d1640.tar.bz2
nixlib-12ee0fbd8883cb5a17b499c42c8d6cdf602d1640.tar.lz
nixlib-12ee0fbd8883cb5a17b499c42c8d6cdf602d1640.tar.xz
nixlib-12ee0fbd8883cb5a17b499c42c8d6cdf602d1640.tar.zst
nixlib-12ee0fbd8883cb5a17b499c42c8d6cdf602d1640.zip
virtualbox: Add patch for Linux 4.12
Compiling the kernel modules on Linux 4.12 fails, so I've included an
upstream patch from:

https://www.virtualbox.org/changeset/66927/vbox

The patch is applied against the guest additions as well, where we need
to transform the patch a bit so that we get CR LF line endings (DOS
format), which is what is the case for the guest additions ISO.

I've tested this with all the subtests of the "virtualbox" NixOS VM
tests and they all succeed on x86_64-linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox/guest-additions')
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 3c9f28f4f2d5..8865022c23e4 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation {
     for i in *
     do
         cd $i
+        # Files within the guest additions ISO are using DOS line endings
+        sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \
+          | patch -d vboxguest -p4
         find . -type f | xargs sed 's/depmod -a/true/' -i
         make
         cd ..