diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
| commit | 8abe5ee07ee6b23fb014709f01bb161a62407a44 (patch) | |
| tree | 23fe6fb06258812145de6c5c2c41bf83b887af72 /pkgs/os-specific/linux/kernel | |
| parent | ef0dbef7f15f962f9fedfd86563664bc95e6e2f9 (diff) | |
| parent | f2affe03443d916d1c693dc246e48985bc2222d4 (diff) | |
| download | nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.gz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.bz2 nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.lz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.xz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.zst nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 6 |
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 2f091b95cfc..a735d165299 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -427,6 +427,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; |