diff options
author | John Wiegley <johnw@newartisans.com> | 2014-12-17 12:11:30 -0600 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2014-12-26 11:06:21 -0600 |
commit | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (patch) | |
tree | 1931763370f483739474ebe0ab219eb0d7256c13 /pkgs/applications/networking/remote | |
parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) |
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet this change is also compatible with Linux.
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r-- | pkgs/applications/networking/remote/teamviewer/8.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/teamviewer/9.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/teamviewer/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index a47d7bad4c9df..ba5cc85e5a4e9 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -5,7 +5,7 @@ let topath = "${wineUnstable}/bin"; toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); + [ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); in stdenv.mkDerivation { name = "teamviewer-8.0.17147"; @@ -34,8 +34,8 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/teamviewer - patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd + patchelf --set-rpath "${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/ ''; diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix index 6ae68aea9ea3e..8078ae1b6ff50 100644 --- a/pkgs/applications/networking/remote/teamviewer/9.nix +++ b/pkgs/applications/networking/remote/teamviewer/9.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { chmod +x $out/bin/teamviewer patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/ ''; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 65ddd7305c832..8e42e8004c543 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,7 +6,7 @@ let topath = "${wine}/bin"; toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]); + [ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]); in stdenv.mkDerivation { name = "teamviewer-7.0.9377"; |