about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/common-config.nix
diff options
context:
space:
mode:
authorAmbroz Bizjak <abizjak.pro@gmail.com>2019-05-04 21:13:26 +0200
committerAmbroz Bizjak <abizjak.pro@gmail.com>2019-05-04 21:14:30 +0200
commitc6934f347a891dacfacdfe96994ff4cc5e63a1f8 (patch)
tree826772f7a4f30d6a6145e41d48c05e77b34ff189 /pkgs/os-specific/linux/kernel/common-config.nix
parent74bc006bbbbe8ef573ad083bc5ea6802a22f6aed (diff)
downloadnixlib-c6934f347a891dacfacdfe96994ff4cc5e63a1f8.tar
nixlib-c6934f347a891dacfacdfe96994ff4cc5e63a1f8.tar.gz
nixlib-c6934f347a891dacfacdfe96994ff4cc5e63a1f8.tar.bz2
nixlib-c6934f347a891dacfacdfe96994ff4cc5e63a1f8.tar.lz
nixlib-c6934f347a891dacfacdfe96994ff4cc5e63a1f8.tar.xz
nixlib-c6934f347a891dacfacdfe96994ff4cc5e63a1f8.tar.zst
nixlib-c6934f347a891dacfacdfe96994ff4cc5e63a1f8.zip
kernel: Disable VirtualBox guest modules.
These break the modules from VirtualBox additions. Fixes issue https://github.com/NixOS/nixpkgs/issues/58127.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5711e019f95b..58a2429d47c6 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -426,6 +426,12 @@ let
 
       VFIO_PCI_VGA = mkIf stdenv.is64bit yes;
 
+      # VirtualBox guest drivers in the kernel conflict with the ones in the
+      # official additions package and prevent the vboxsf module from loading,
+      # so disable them for now.
+      VBOXGUEST = option no;
+      DRM_VBOXVIDEO = option no;
+
     } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
       XEN = option yes;