diff options
| author | Shea Levy <shea@shealevy.com> | 2014-12-26 12:28:15 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-12-26 12:28:15 -0500 |
| commit | 05edd656f6bdecde31eb0270209cfc7e2320caad (patch) | |
| tree | 4b7c9eaf4d76874b7114015038ceb7d3e23b64bc /pkgs/applications | |
| parent | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (diff) | |
| download | nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.gz nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.bz2 nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.lz nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.xz nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.zst nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.zip | |
Missed gcc refs
Diffstat (limited to 'pkgs/applications')
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index c777a695924e..e2dbb6dbc2f8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc + [ stdenv.cc.gcc gconf alsaLib at_spi2_atk @@ -100,7 +100,7 @@ stdenv.mkDerivation { nss pango ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.gcc.gcc + stdenv.cc.gcc ]; installPhase = diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix index 8078ae1b6ff5..4b449497dcc0 100644 --- a/pkgs/applications/networking/remote/teamviewer/9.nix +++ b/pkgs/applications/networking/remote/teamviewer/9.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-9.0.32150"; @@ -34,7 +34,7 @@ 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/teamviewer9/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/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/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix index 4d7614e4ce35..c9956497b109 100644 --- a/pkgs/applications/office/zotero/firefox-bin/default.nix +++ b/pkgs/applications/office/zotero/firefox-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc + [ stdenv.cc.gcc alsaLib atk cairo @@ -106,7 +106,7 @@ stdenv.mkDerivation { pulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.gcc.gcc + stdenv.cc.gcc ]; # "strip" after "patchelf" may break binaries. |