pyrox.dev
teamviewer: 15.15.5 -> 15.18.5
Upgrading to the last version still using qt5.14. Later version
will be using qt5.15 which is not in 21.05 stable branch.
This fixes us the crash observed in 15.15.5 when stopping
the service.
+13
-8
pkgs/applications/networking/remote/teamviewer/default.nix
+13
-8
pkgs/applications/networking/remote/teamviewer/default.nix
···
1
1
{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus
2
-
, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc
2
+
, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc
3
3
, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes
4
4
, wrapQtAppsHook
5
5
}:
6
6
7
7
mkDerivation rec {
8
8
pname = "teamviewer";
9
-
version = "15.15.5";
9
+
version = "15.18.5";
10
10
11
11
src = fetchurl {
12
12
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
13
-
sha256 = "sha256-H/CSc2RcjI+Fm8awYcXm3ioAJpbSNEMwGVrTozMux3A=";
13
+
sha256 = "03m8k6qr3mgylik1gqi8qlm0dngb3vf4p6gdwd5hyvz7gh5mdm2r";
14
14
};
15
15
16
16
unpackPhase = ''
···
19
19
'';
20
20
21
21
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
22
-
buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ];
22
+
buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ];
23
23
propagatedBuildInputs = [ qtquickcontrols ];
24
24
25
25
installPhase = ''
···
73
73
substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \
74
74
--replace '/var/run/' '/run/'
75
75
76
-
wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 dbus ]}"
77
-
wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 dbus ]}"
78
-
wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 dbus ]}"
79
-
wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}"
76
+
wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer \
77
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 dbus ]}"
78
+
wrapProgram $out/share/teamviewer/tv_bin/teamviewerd \
79
+
--prefix PATH : "${lib.makeBinPath [ getconf ]}" \
80
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 dbus ]}"
81
+
wrapProgram $out/share/teamviewer/tv_bin/TeamViewer \
82
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 dbus ]}"
83
+
wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop \
84
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}"
80
85
81
86
wrapQtApp $out/share/teamviewer/tv_bin/script/teamviewer
82
87
wrapQtApp $out/bin/teamviewer