suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

teamviewer: 10.0.37742 -> 11.0.53191

Browse Source 
(rebased version of commits c3d503d33d and a81b396a2e)

Extra care is taken to save old versions to minimize changes. Closes #12362
This commit is contained in:
Nikolay Amiantov 2016-01-14 14:00:01 +03:00
parent dc451e1402
commit ca431d1db9
3 changed files with 94 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/monitoring/teamviewer.nix
View File

@ -14,7 +14,7 @@ in
options = {
services.teamviewer.enable = mkEnableOption "teamviewer daemon";
services.teamviewer.enable = mkEnableOption "TeamViewer daemon";
};
@ -27,8 +27,9 @@ in
systemd.services.teamviewerd = {
description = "TeamViewer remote control daemon";
wantedBy = [ "graphical.target" ];
wantedBy = [ "multi-user.target" ];
after = [ "NetworkManager-wait-online.service" "network.target" ];
preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer";
serviceConfig = {
Type = "forking";

86
pkgs/applications/networking/remote/teamviewer/default.nix Normal file
View File

@ -0,0 +1,86 @@
{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }:
let
version = "11.0.53191";
ld32 =
if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
else abort "Unsupported architecture";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]);
tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
tvldpath64 = lib.makeLibraryPath (deps pkgs);
in
stdenv.mkDerivation {
name = "teamviewer-${version}";
src = fetchurl {
# There is a 64-bit package, but it has no differences apart from Debian dependencies.
# Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
sha256 = "1yr4c7d6hymw7kvca2jqxzaz6rw5xr66iby77aknd0v4afh4yzz3";
};
unpackPhase = ''
ar x $src
tar xf data.tar.*
'';
installPhase = ''
mkdir -p $out/share/teamviewer $out/bin $out/share/applications
cp -a opt/teamviewer/* $out/share/teamviewer
rm -R \
$out/share/teamviewer/logfiles \
$out/share/teamviewer/config \
$out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \
$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
ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin
ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer-teamviewer*.desktop $out/share/applications
ln -s /var/lib/teamviewer $out/share/teamviewer/config
ln -s /var/log/teamviewer $out/share/teamviewer/logfiles
ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils
pushd $out/share/teamviewer/tv_bin
sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config
${if stdenv.system == "x86_64-linux" then ''
sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config
'' else ''
sed -i ",TV_LD64_PATH=.*,d" script/tvw_config
''}
sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop
for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do
echo "patching $i"
patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true
done
for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do
echo "patching $i"
patchelf --set-rpath ${tvldpath32} $i || true
done
${if stdenv.system == "x86_64-linux" then ''
patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64
'' else ''
rm TVGuiSlave.64
''}
popd
'';
dontPatchELF = true;
dontStrip = true;
meta = with stdenv.lib; {
homepage = "http://www.teamviewer.com";
license = licenses.unfree;
description = "Desktop sharing application, providing remote support and online meetings";
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ jagajaga ];
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -3178,12 +3178,16 @@ let
tcpflow = callPackage ../tools/networking/tcpflow { };
teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { };
teamviewer = callPackage ../applications/networking/remote/teamviewer {
stdenv = stdenv_32bit;
};
teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { });
teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { });
teamviewer10 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { });
telnet = callPackage ../tools/networking/telnet { };
texmacs = callPackage ../applications/editors/texmacs {