pyrox.dev
virtualbox: Fix load of dbus library at runtime.
VirtualBox had support for DBUS even in version 4.x, but it appears that
nothing in our VM test triggered it to load, thus I didn't notice the
runtime error:
rtldrNativeLoad: dlopen('libdbus-1.so.3', RTLD_NOW | RTLD_LOCAL) failed:
libdbus-1.so.3: cannot open shared object file: No such
file or directory
The upstream commits I think are responsible for this to come to surface
are _probably_ (did I ever mention that I love SVN? *cough*) one of
these:
https://www.virtualbox.org/changeset/55664/vbox
https://www.virtualbox.org/changeset/55602/vbox
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
+7
-4
pkgs/applications/virtualization/virtualbox/default.nix
+7
-4
pkgs/applications/virtualization/virtualbox/default.nix
···
1
1
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
2
2
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
3
-
, which, alsaLib, curl, libvpx, gawk, nettools
3
+
, which, alsaLib, curl, libvpx, gawk, nettools, dbus
4
4
, xorriso, makeself, perl, pkgconfig, nukeReferences
5
5
, javaBindings ? false, jdk ? null
6
6
, pythonBindings ? false, python ? null
···
85
85
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
86
86
find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
87
87
sed -i -e '
88
-
s@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g
88
+
s@"libdbus-1\.so\.3"@"${dbus}/lib/libdbus-1.so.3"@g
89
+
s@"libasound\.so\.2"@"${alsaLib}/lib/libasound.so.2"@g
89
90
${optionalString pulseSupport ''
90
-
s@"libpulse.so.0"@"${libpulseaudio}/lib/libpulse.so.0"@g
91
+
s@"libpulse\.so\.0"@"${libpulseaudio}/lib/libpulse.so.0"@g
91
92
''}
92
-
' src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/{alsa,pulse}_stubs.c
93
+
' src/VBox/Main/xml/Settings.cpp \
94
+
src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \
95
+
include/VBox/dbus-calls.h
93
96
export USER=nix
94
97
set +x
95
98
'';