summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-07-05 04:11:44 +0200
committerGitHub <noreply@github.com>2020-07-05 04:11:44 +0200
commit07cebeffb8866d9b0bdda060e167ba72f9d67e25 (patch)
treea10649d881e07167aa4f61a799d17deb7bb08350 /nixos/modules/virtualisation
parentf233572fdc9730c967f4a378ebd760167385d302 (diff)
parentf29063ff0bc0348ab7b64ad8f1038e9ecb065727 (diff)
downloadnixpkgs-07cebeffb8866d9b0bdda060e167ba72f9d67e25.tar
nixpkgs-07cebeffb8866d9b0bdda060e167ba72f9d67e25.tar.gz
nixpkgs-07cebeffb8866d9b0bdda060e167ba72f9d67e25.tar.bz2
nixpkgs-07cebeffb8866d9b0bdda060e167ba72f9d67e25.tar.lz
nixpkgs-07cebeffb8866d9b0bdda060e167ba72f9d67e25.tar.xz
nixpkgs-07cebeffb8866d9b0bdda060e167ba72f9d67e25.tar.zst
nixpkgs-07cebeffb8866d9b0bdda060e167ba72f9d67e25.zip
Merge pull request #86473 from bachp/virtualbox-vmsvga
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/virtualbox-guest.nix2
-rw-r--r--nixos/modules/virtualisation/virtualbox-image.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 834b994e92d..486951983d3 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -68,7 +68,7 @@ in
         SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"
       '';
   } (mkIf cfg.x11 {
-    services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" "modesetting" ];
+    services.xserver.videoDrivers = mkOverride 50 [ "vmware" "virtualbox" "modesetting" ];
 
     services.xserver.config =
       ''
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 788b4d9d976..136bbad60a4 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -72,6 +72,7 @@ in {
         audiocontroller = "ac97";
         audio = "alsa";
         audioout = "on";
+        graphicscontroller = "vmsvga";
         rtcuseutc = "on";
         usb = "on";
         usbehci = "on";