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

virtualboxGuestAdditions: Fix clipboard integration.

Browse Source 
VBoxClient needs a RUNPATH entry to dlopen libXfixes successfully.

Fixes https://github.com/NixOS/nixpkgs/issues/65542
This commit is contained in:
Ambroz Bizjak 2019-09-23 18:06:15 +02:00
parent d70eba7ab3
commit 7dcef37ef8
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,16 @@ let
# It's likely to work again in some future update. # It's likely to work again in some future update.
xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1;
in if abi == "119" || abi == "120" then "118" else abi; 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}"; name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl { src = fetchurl {
@ -134,13 +141,13 @@ stdenv.mkDerivation {
# Stripping breaks these binaries for some reason. # Stripping breaks these binaries for some reason.
dontStrip = true; dontStrip = true;
# Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped. # Patch RUNPATH according to dlopenLibs (see the comment there).
postFixup = '' postFixup = lib.concatMapStrings (library: ''
for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do
origRpath=$(patchelf --print-rpath "$i") origRpath=$(patchelf --print-rpath "$i")
patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i" patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i"
done done
''; '') dlopenLibs;
meta = { meta = {
description = "Guest additions for VirtualBox"; description = "Guest additions for VirtualBox";