Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f233572fdc97
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07cebeffb886
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 17, 2020

  1. virtualbox-guest-additions: fix dlopen of libXrandr 

    The library could not be loaded which prevented autoresizing
when using the VMSVGA adapter.
    @bachp
    bachp committed Jun 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9c300b6 View commit details

  2. nixos/virtualbox-guest: add vmware driver 

    VMSGVA is recommended by virtualbox for Linux clients.
Compared to VBoxVGA and VBoxSVGA it also supports 3D acceleration.

Adding the driver makes nixos work with all three supported graphics card
types.
    @bachp
    bachp committed Jun 17, 2020
    Copy the full SHA
    ec9792a View commit details

  3. nixos/manual: recommend VMSVGA as graphics adapter 

    Virtualbox recommends VMSVGA for Linux guests.

It is also currently the only one supporting 3D acceleration
and it works out of the box with NixOS and auto screen resizing.
    @bachp
    bachp committed Jun 17, 2020
    Copy the full SHA
    6c2d12f View commit details

  4. nixos/virtualbox-image: change graphics adapter to vmswga

    @bachp
    bachp committed Jun 17, 2020
    Copy the full SHA
    f29063f View commit details

Commits on Jul 5, 2020

  1. Merge pull request #86473 from bachp/virtualbox-vmsvga

    @jtojnar
    jtojnar authored Jul 5, 2020
    Copy the full SHA
    07cebef View commit details
2 changes: 1 addition & 1 deletion nixos/doc/manual/installation/installing-virtualbox-guest.xml
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
</listitem>
<listitem>
<para>
Click on Settings / Display / Screen and select VBoxVGA as Graphics Controller
Click on Settings / Display / Screen and select VMSVGA as Graphics Controller
</para>
</listitem>
<listitem>
2 changes: 1 addition & 1 deletion nixos/modules/virtualisation/virtualbox-guest.nix
View file
Original file line number Diff line number Diff line change
@@ -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 =
''
1 change: 1 addition & 0 deletions nixos/modules/virtualisation/virtualbox-image.nix
View file
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ in {
audiocontroller = "ac97";
audio = "alsa";
audioout = "on";
graphicscontroller = "vmsvga";
rtcuseutc = "on";
usb = "on";
usbehci = "on";
1 change: 1 addition & 0 deletions pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ let
dlopenLibs = [
{ name = "libdbus-1.so"; pkg = dbus; }
{ name = "libXfixes.so"; pkg = xorg.libXfixes; }
{ name = "libXrandr.so"; pkg = xorg.libXrandr; }
];

in stdenv.mkDerivation rec {