dbus: split into multiple outputs and fix referrers

This commit is contained in:
Vladimír Čunát
2015-10-13 20:19:01 +02:00
parent ad824a6a30
commit 783c40eb68
42 changed files with 95 additions and 170 deletions
@@ -85,7 +85,7 @@ in stdenv.mkDerivation {
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
sed -i -e '
s@"libdbus-1\.so\.3"@"${dbus.out}/lib/libdbus-1.so.3"@g
s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g
s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g
${optionalString pulseSupport ''
s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
for i in lib/VBoxOGL*.so
do
patchelf --set-rpath $out/lib:${dbus}/lib $i
patchelf --set-rpath $out/lib:${dbus.lib}/lib $i
done
# FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions