alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

teamviewer: keep RTlib directory

Browse source 
Added the formerly deleted RTlib directory, included its
patchelf commands. Beforehand the client failed, because
TVGuiDelegate did not find all symbols.

fixes #24862
This commit is contained in:
Christoph-Simon Senjak 2017-04-13 01:14:03 +02:00 committed by Jörg Thalheim
parent 478e9cdae5
commit dcbb2bf751
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/remote/teamviewer/default.nix
View file

@ -9,7 +9,7 @@ let
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]);
deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
tvldpath64 = lib.makeLibraryPath (deps pkgs);
in
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
rm -R \
$out/share/teamviewer/logfiles \
$out/share/teamviewer/config \
$out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \
$out/share/teamviewer/tv_bin/xdg-utils \
$out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh}
ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
@ -57,13 +57,13 @@ stdenv.mkDerivation rec {
sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop
for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do
for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do
echo "patching $i"
patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true
patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
done
for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do
for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do
echo "patching $i"
patchelf --set-rpath ${tvldpath32} $i || true
patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
done
${if stdenv.system == "x86_64-linux" then ''
patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64
@ -81,6 +81,6 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
description = "Desktop sharing application, providing remote support and online meetings";
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ jagajaga ];
maintainers = with maintainers; [ jagajaga dasuxullebt ];
};
}