diff options
author | michael bishop <cleverca22@gmail.com> | 2015-10-26 15:13:25 -0300 |
---|---|---|
committer | michael bishop <cleverca22@gmail.com> | 2015-10-26 15:22:01 -0300 |
commit | b81f51cecf8ea4da99b837f18eef4164b1d10519 (patch) | |
tree | 841c860aa8b39205c1b0a5d10da8403f02f62fbf /pkgs/applications/networking/remote/teamviewer | |
parent | 6e9f77dc29b76ac80de3b3a06c7347dc9f8c657f (diff) | |
download | nixlib-b81f51cecf8ea4da99b837f18eef4164b1d10519.tar nixlib-b81f51cecf8ea4da99b837f18eef4164b1d10519.tar.gz nixlib-b81f51cecf8ea4da99b837f18eef4164b1d10519.tar.bz2 nixlib-b81f51cecf8ea4da99b837f18eef4164b1d10519.tar.lz nixlib-b81f51cecf8ea4da99b837f18eef4164b1d10519.tar.xz nixlib-b81f51cecf8ea4da99b837f18eef4164b1d10519.tar.zst nixlib-b81f51cecf8ea4da99b837f18eef4164b1d10519.zip |
teamviewer: fix the expressions
Diffstat (limited to 'pkgs/applications/networking/remote/teamviewer')
-rw-r--r-- | pkgs/applications/networking/remote/teamviewer/10.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix index 7e97a31c3a92..5de60180c69d 100644 --- a/pkgs/applications/networking/remote/teamviewer/10.nix +++ b/pkgs/applications/networking/remote/teamviewer/10.nix @@ -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 = { |