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

Commits on Sep 23, 2019

  1. virtualboxGuestAdditions: Fix clipboard integration. 

    VBoxClient needs a RUNPATH entry to dlopen libXfixes successfully.

Fixes #65542
    @ambrop72
    ambrop72 committed Sep 23, 2019
    Copy the full SHA
    7dcef37 View commit details

Commits on Sep 25, 2019

  1. virtualboxGuestAdditions: Fix clipboard integration. (#69306) 

    virtualboxGuestAdditions: Fix clipboard integration.
    @flokli
    flokli authored Sep 25, 2019
    Copy the full SHA
    08a1aa4 View commit details
Showing with 14 additions and 7 deletions.
  1. +14 −7 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
21 changes: 14 additions & 7 deletions pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,9 +12,16 @@ let
# It's likely to work again in some future update.
xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1;
in if abi == "119" || abi == "120" then "118" else abi;
in

stdenv.mkDerivation {
# Specifies how to patch binaries to make sure that libraries loaded using
# dlopen are found. We grep binaries for specific library names and patch
# RUNPATH in matching binaries to contain the needed library paths.
dlopenLibs = [
{ name = "libdbus-1.so"; pkg = dbus; }
{ name = "libXfixes.so"; pkg = xorg.libXfixes; }
];

in stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";

src = fetchurl {
@@ -134,13 +141,13 @@ stdenv.mkDerivation {
# Stripping breaks these binaries for some reason.
dontStrip = true;

# Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped.
postFixup = ''
for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do
# Patch RUNPATH according to dlopenLibs (see the comment there).
postFixup = lib.concatMapStrings (library: ''
for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do
origRpath=$(patchelf --print-rpath "$i")
patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i"
patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i"
done
'';
'') dlopenLibs;

meta = {
description = "Guest additions for VirtualBox";