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: c689671345f8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa6c93abe5c6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 23, 2019

  1. linuxPackages.virtualboxGuestAdditions: don't install VBoxOGL for now 

    It seems to be broken upstream too, and fixing it is far down the
priority list:
https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html
Additionally, 3d support seems to rely on VBoxOGL.so being symlinked
from libGL.so (which we can't), and Oracle doesn't plan on supporting
libglvnd either. (#18457)
    @flokli
    flokli committed May 23, 2019
    Copy the full SHA
    8b34ec4 View commit details

Commits on May 26, 2019

  1. linuxPackages.virtualboxGuestAdditions: don't install VBoxOGL for now (… 

    …#61944)

linuxPackages.virtualboxGuestAdditions: don't install VBoxOGL for now
    @flokli
    flokli authored May 26, 2019
    Copy the full SHA
    fa6c93a View commit details
Showing with 11 additions and 5 deletions.
  1. +11 −5 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
16 changes: 11 additions & 5 deletions pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -107,11 +107,17 @@ stdenv.mkDerivation {
wrapProgram $out/bin/VBoxClient-all \
--prefix PATH : "${which}/bin"
# Install OpenGL libraries
mkdir -p $out/lib
cp -v lib/VBoxOGL*.so $out/lib
mkdir -p $out/lib/dri
ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
# Don't install VBoxOGL for now
# It seems to be broken upstream too, and fixing it is far down the priority list:
# https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html
# Additionally, 3d support seems to rely on VBoxOGL.so being symlinked from
# libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd
# either. (#18457)
## Install OpenGL libraries
#mkdir -p $out/lib
#cp -v lib/VBoxOGL*.so $out/lib
#mkdir -p $out/lib/dri
#ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
# Install desktop file
mkdir -p $out/share/autostart