summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2016-11-07 14:36:41 -0600
committerGitHub <noreply@github.com>2016-11-07 14:36:41 -0600
commit6de20a7fe4d076cadea078b77cd2bc3d52e409aa (patch)
tree91df95c178c406a697f79ae3c841c6beb7235fe2
parentdcb2179a1f8f3314c46ab2a21491d3d7153c4360 (diff)
downloadnixpkgs-6de20a7fe4d076cadea078b77cd2bc3d52e409aa.tar
nixpkgs-6de20a7fe4d076cadea078b77cd2bc3d52e409aa.tar.gz
nixpkgs-6de20a7fe4d076cadea078b77cd2bc3d52e409aa.tar.bz2
nixpkgs-6de20a7fe4d076cadea078b77cd2bc3d52e409aa.tar.lz
nixpkgs-6de20a7fe4d076cadea078b77cd2bc3d52e409aa.tar.xz
nixpkgs-6de20a7fe4d076cadea078b77cd2bc3d52e409aa.tar.zst
nixpkgs-6de20a7fe4d076cadea078b77cd2bc3d52e409aa.zip
virtualbox-demo: Add modesetting to drivers
This needs to be included for VirtualBox to detect that it needs to start the video driver. "modesetting" is also set in virtualbox-image.nix but this line seems to take precedence over that one (even though the virtualbox-image.nix has a higher override?) This should fix the problems that I and a few others have been having with the .ova files built for nixos.org.

Fixes #20007.
-rw-r--r--nixos/modules/installer/virtualbox-demo.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 49ec0899610..5316cfce906 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -18,5 +18,5 @@ with lib;
 
   # Add some more video drivers to give X11 a shot at working in
   # VMware and QEMU.
-  services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
+  services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
 }