diff options
| author | Robin Gloster <mail@glob.in> | 2019-09-13 23:26:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 23:26:29 +0200 |
| commit | c53d6f947ffc74ff93b73bbce0636d18bdf7a52e (patch) | |
| tree | 8277ce2216f35963d4d11cb84e56662a23243c4a /pkgs/applications | |
| parent | e4581fb5abeb45c1498f50f8e296f6dc2eb11a34 (diff) | |
| parent | 2756c3054c338c29e39d7f9d2aea465684411a87 (diff) | |
| download | nixlib-c53d6f947ffc74ff93b73bbce0636d18bdf7a52e.tar nixlib-c53d6f947ffc74ff93b73bbce0636d18bdf7a52e.tar.gz nixlib-c53d6f947ffc74ff93b73bbce0636d18bdf7a52e.tar.bz2 nixlib-c53d6f947ffc74ff93b73bbce0636d18bdf7a52e.tar.lz nixlib-c53d6f947ffc74ff93b73bbce0636d18bdf7a52e.tar.xz nixlib-c53d6f947ffc74ff93b73bbce0636d18bdf7a52e.tar.zst nixlib-c53d6f947ffc74ff93b73bbce0636d18bdf7a52e.zip | |
Merge pull request #68673 from ck3d/fix-vb-guest-kernel52
virtualboxGuestAdditions: fix compilation with kernel 5.2
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index e7f6fad79f90..ad860b07bdf6 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies; + postPatch = '' + substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \ + --replace "<ttm/" "<drm/ttm/" + ''; + unpackPhase = '' ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run |