pyrox.dev
teamviewer: keep RTlib directory
Added the formerly deleted RTlib directory, included its
patchelf commands. Beforehand the client failed, because
TVGuiDelegate did not find all symbols.
fixes #24862
authored by Christoph-Simon Senjak and committed by Jörg Thalheim dcbb2bf7 478e9cda
+7
-7
pkgs/applications/networking/remote/teamviewer/default.nix
+7
-7
pkgs/applications/networking/remote/teamviewer/default.nix
···
9
9
10
10
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
11
11
12
-
deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]);
12
+
deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
13
13
tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
14
14
tvldpath64 = lib.makeLibraryPath (deps pkgs);
15
15
in
···
36
36
rm -R \
37
37
$out/share/teamviewer/logfiles \
38
38
$out/share/teamviewer/config \
39
-
$out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \
39
+
$out/share/teamviewer/tv_bin/xdg-utils \
40
40
$out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh}
41
41
42
42
ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
···
57
57
58
58
sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop
59
59
60
-
for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do
60
+
for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do
61
61
echo "patching $i"
62
-
patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true
62
+
patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
63
63
done
64
-
for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do
64
+
for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do
65
65
echo "patching $i"
66
-
patchelf --set-rpath ${tvldpath32} $i || true
66
+
patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
67
67
done
68
68
${if stdenv.system == "x86_64-linux" then ''
69
69
patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64
···
81
81
license = licenses.unfree;
82
82
description = "Desktop sharing application, providing remote support and online meetings";
83
83
platforms = [ "i686-linux" "x86_64-linux" ];
84
-
maintainers = with maintainers; [ jagajaga ];
84
+
maintainers = with maintainers; [ jagajaga dasuxullebt ];
85
85
};
86
86
}