MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

teamviewer: 14.4.2269 -> 14.5.1691

Browse source 
https://community.teamviewer.com/t5/Change-Logs/Linux-v14-5-1691-Full-Change-Log/m-p/69997

Also ensured that QT is wrapped properly to avoid startup issues with
different system-wide QT versions.

(cherry picked from commit 1fc1fe7e6a)
This commit is contained in:
Maximilian Bosch 2019-08-22 13:17:29 +02:00
parent 948b3e34a5
commit 37aad44132
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,16 @@
{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: { mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus
, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11
, wrapQtAppsHook
}:
stdenv.mkDerivation rec { mkDerivation rec {
name = "teamviewer-${version}"; name = "teamviewer-${version}";
version = "14.4.2669"; version = "14.5.1691";
src = fetchurl { src = fetchurl {
url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb";
sha256 = "0vk782xpp8plbaz8cfggp0jrw7n8d5p9lv605pzmgxyq5h8z72za"; sha256 = "1dzvjyvcqcah6z1dvw4zvmbdn8iks9j2909slbkksavn1rp3akxc";
}; };
unpackPhase = '' unpackPhase = ''
@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
tar xf data.tar.* tar xf data.tar.*
''; '';
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ];
propagatedBuildInputs = [ qtquickcontrols ]; propagatedBuildInputs = [ qtquickcontrols ];
@ -41,13 +44,15 @@ stdenv.mkDerivation rec {
--replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2'
substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \
--replace '/var/run/' '/run/' --replace '/var/run/' '/run/'
wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}"
wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}"
wrapQtApp $out/bin/teamviewer
''; '';
dontStrip = true; dontStrip = true;
meta = with stdenv.lib; { meta = with lib; {
homepage = http://www.teamviewer.com; homepage = http://www.teamviewer.com;
license = licenses.unfree; license = licenses.unfree;
description = "Desktop sharing application, providing remote support and online meetings"; description = "Desktop sharing application, providing remote support and online meetings";

2
pkgs/top-level/all-packages.nix
View file

@ -6367,7 +6367,7 @@ in
ted = callPackage ../tools/typesetting/ted { }; ted = callPackage ../tools/typesetting/ted { };
teamviewer = libsForQt56.callPackage ../applications/networking/remote/teamviewer { }; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
teleconsole = callPackage ../tools/misc/teleconsole { }; teleconsole = callPackage ../tools/misc/teleconsole { };