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

Merge pull request #86473 from bachp/virtualbox-vmsvga

Browse Source
This commit is contained in:
Jan Tojnar 2020-07-05 04:11:44 +02:00 committed by GitHub
commit 07cebeffb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/installation/installing-virtualbox-guest.xml
View File

@ -49,7 +49,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
Click on Settings / Display / Screen and select VBoxVGA as Graphics Controller Click on Settings / Display / Screen and select VMSVGA as Graphics Controller
</para> </para>
</listitem> </listitem>
<listitem> <listitem>

2
nixos/modules/virtualisation/virtualbox-guest.nix
View File

@ -68,7 +68,7 @@ in
SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"
''; '';
} (mkIf cfg.x11 { } (mkIf cfg.x11 {
services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" "modesetting" ]; services.xserver.videoDrivers = mkOverride 50 [ "vmware" "virtualbox" "modesetting" ];
services.xserver.config = services.xserver.config =
'' ''

1
nixos/modules/virtualisation/virtualbox-image.nix
View File

@ -72,6 +72,7 @@ in {
audiocontroller = "ac97"; audiocontroller = "ac97";
audio = "alsa"; audio = "alsa";
audioout = "on"; audioout = "on";
graphicscontroller = "vmsvga";
rtcuseutc = "on"; rtcuseutc = "on";
usb = "on"; usb = "on";
usbehci = "on"; usbehci = "on";

1
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -19,6 +19,7 @@ let
dlopenLibs = [ dlopenLibs = [
{ name = "libdbus-1.so"; pkg = dbus; } { name = "libdbus-1.so"; pkg = dbus; }
{ name = "libXfixes.so"; pkg = xorg.libXfixes; } { name = "libXfixes.so"; pkg = xorg.libXfixes; }
{ name = "libXrandr.so"; pkg = xorg.libXrandr; }
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {