JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10631 from cleverca22/teamviewer

Browse Source 
teamviewer: fix the expressions
This commit is contained in:
Arseniy Seroka 2015-10-27 00:47:44 +03:00
commit 1a5c57ca3a
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ in
wantedBy = [ "graphical.target" ];
after = [ "NetworkManager-wait-online.service" "network.target" ];
preStart = "mkdir -pv /var/tmp/teamviewer10/{logs,config}";
serviceConfig = {
Type = "forking";

22
pkgs/applications/networking/remote/teamviewer/10.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes,
wineUnstable, makeWrapper, libXau , bash, patchelf, config,
acceptLicense ? false }:
wineUnstable, makeWrapper, libXau , patchelf, config }:
with stdenv.lib;
@ -30,22 +29,23 @@ stdenv.mkDerivation {
rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share}
cat > $out/bin/teamviewer << EOF
#!${bash}/bin/sh
#!${stdenv.shell}
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=${topath}\''${PATH:+:\$PATH}
$out/share/teamviewer/tv_bin/script/teamviewer "\$@"
EOF
chmod +x $out/bin/teamviewer
patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd
ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/
${optionalString acceptLicense "
cat > $out/share/teamviewer/config/global.conf << EOF
[int32] EulaAccepted = 1
[int32] EulaAcceptedRevision = 6
EOF
"}
rm -rf $out/share/teamviewer/logfiles $out/share/teamviewer/config
ln -sv /var/tmp/teamviewer10/logs/ $out/share/teamviewer/logfiles
ln -sv /var/tmp/teamviewer10/config/ $out/share/teamviewer/config
'';
# the fixupPhase undoes the rpath patch
postFixup = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd
patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd
'';
meta = {