mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
teamviewer: pass script argument to underlying command
This commit is contained in:
parent
b6a720141e
commit
241738bca6
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper, libXau
|
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau
|
||||||
, bash, patchelf }:
|
, bash, patchelf }:
|
||||||
|
|
||||||
let
|
let
|
||||||
topath = "${wine}/bin";
|
topath = "${wineUnstable}/bin";
|
||||||
|
|
||||||
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
|
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
|
||||||
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
|
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "teamviewer-8.0.17147";
|
name = "teamviewer-8.0.17147";
|
||||||
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
|||||||
#!${bash}/bin/sh
|
#!${bash}/bin/sh
|
||||||
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
|
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
|
||||||
export PATH=${topath}\''${PATH:+:\$PATH}
|
export PATH=${topath}\''${PATH:+:\$PATH}
|
||||||
$out/share/teamviewer8/tv_bin/script/teamviewer
|
$out/share/teamviewer8/tv_bin/script/teamviewer "\$@"
|
||||||
EOF
|
EOF
|
||||||
chmod +x $out/bin/teamviewer
|
chmod +x $out/bin/teamviewer
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user