public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114735 from andresilva/virtualbox-linux-511

Browse Source 
virtualbox: fix build on linux 5.11
This commit is contained in:
Sandro 2021-03-02 13:50:58 +01:00 committed by GitHub
commit 8958b4fdae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -103,6 +103,8 @@ in stdenv.mkDerivation {
qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}";
}) })
++ [ ++ [
# NOTE: the patch for linux 5.11 can be removed when the next version of VirtualBox is released
./linux-5-11.patch
./qtx11extras.patch ./qtx11extras.patch
]; ];

12
pkgs/applications/virtualization/virtualbox/linux-5-11.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
index 7033b45..c8178a6 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -39,6 +39,7 @@
#endif
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
#include <linux/rtnetlink.h>
#include <linux/miscdevice.h>
#include <linux/inetdevice.h>