From 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 17 Dec 2014 12:11:30 -0600 Subject: 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. --- pkgs/applications/networking/bittorrentsync/default.nix | 4 ++-- pkgs/applications/networking/browsers/chromium/plugins.nix | 2 +- pkgs/applications/networking/browsers/firefox-bin/default.nix | 6 +++--- pkgs/applications/networking/browsers/firefox/default.nix | 2 +- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 10 +++++----- pkgs/applications/networking/browsers/opera/default.nix | 6 +++--- pkgs/applications/networking/cluster/hadoop/default.nix | 2 +- .../networking/instant-messengers/baresip/default.nix | 4 ++-- .../networking/instant-messengers/fuze/default.nix | 4 ++-- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- .../networking/instant-messengers/skype/default.nix | 4 ++-- .../networking/instant-messengers/teamspeak/client.nix | 4 ++-- .../networking/instant-messengers/teamspeak/server.nix | 4 ++-- .../networking/mailreaders/thunderbird-bin/default.nix | 2 +- pkgs/applications/networking/remote/teamviewer/8.nix | 6 +++--- pkgs/applications/networking/remote/teamviewer/9.nix | 2 +- pkgs/applications/networking/remote/teamviewer/default.nix | 2 +- 17 files changed, 34 insertions(+), 34 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index e73c59c5a377..974a5a83de4f 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -9,7 +9,7 @@ let else if stdenv.system == "i686-linux" then "0jv3zg0jhdzsc56kkpylwihvhsz73gsl2i2pjmqk3r3x4gwjk8xx" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { name = "btsync-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin/" cp -r "btsync" "$out/bin/" - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} "$out/bin/btsync" ''; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 55e0cc4caa21..8e2dd2a48869 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -35,7 +35,7 @@ let ''; patchPhase = let - rpaths = [ stdenv.gcc.gcc ]; + rpaths = [ stdenv.cc.gcc ]; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; in '' for sofile in PepperFlash/libpepflashplayer.so \ diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3f85467fe315..c9956497b109 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/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. @@ -125,7 +125,7 @@ stdenv.mkDerivation { firefox mozilla-xremote-client firefox-bin plugin-container \ updater crashreporter webapprt-stub do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/usr/lib/firefox-bin-${version}/$executable" done diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 2892aa328b0c..b5b1faa81467 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; +assert stdenv.cc ? libc && stdenv.cc.libc != null; let version = "34.0.5"; in diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 029df7e46ded..826f35fa839d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -32,7 +32,7 @@ let xorg.libXfixes xorg.libXrender xorg.libXrandr - stdenv.gcc.gcc + stdenv.cc.gcc alsaLib pulseaudio dbus_glib @@ -76,19 +76,19 @@ stdenv.mkDerivation rec { cp opt/google/talkplugin/*.so $plugins for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do - patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" $plugins/$i + patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.gcc xorg.libX11 ]}:${stdenv.cc.gcc}/lib64" $plugins/$i done for i in libgoogletalkremoting.so libnpo1d.so; do - patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" $plugins/$i + patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.gcc}/lib64" $plugins/$i done mkdir -p $out/libexec/google/talkplugin cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/ patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "${rpathProgram}:${stdenv.gcc.gcc}/lib64" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpathProgram}:${stdenv.cc.gcc}/lib64" \ $out/libexec/google/talkplugin/GoogleTalkPlugin # Generate an LD_PRELOAD wrapper to redirect execvp() calls to diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d0fe7e91989d..eefae9d5dae8 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -6,7 +6,7 @@ , kdeSupport ? false, qt4, kdelibs }: -assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null; +assert stdenv.isLinux && stdenv.cc.gcc != null && stdenv.cc.libc != null; let mirror = http://get.geo.opera.com/pub/opera; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE + [ stdenv.cc.gcc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig libXrender libuuid expat gstreamer libxml2 gst_plugins_base ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { elif [ $type == "EXEC" ]; then echo "patching $f executable <<" patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ "$f" elif [ $type == "DYN" ]; then diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index f6e86c6289cf..baa13254f234 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { for n in "bin/"* "sbin/"*; do sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" done - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" bin/container-executor + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor ''; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index b878427e876a..ef414899aae0 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] - ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" - ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 41ffb421f8e6..083299b3dc52 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom - libX11 libXmu libXv qt4 libXtst mesa stdenv.gcc.gcc zlib + libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.gcc zlib gnome.GConf libidn rtmpdump c-ares openldap ]; buildCommand = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation { cp -R usr/lib/fuzebox $out/lib patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib/fuzebox:$libPath \ $out/lib/fuzebox/FuzeLinuxApp diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 5206db497b83..c2c69b0e2fbe 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -41,7 +41,7 @@ let xz libcanberra xcbutilkeysyms - ] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; + ] + ":${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; src = if stdenv.system == "x86_64-linux" then @@ -76,7 +76,7 @@ stdenv.mkDerivation { mv usr/share $out for file in $(find $d -type f); do - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true patchelf --set-rpath ${rpath}:\$ORIGIN $file || true done diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 32755306cc76..a1ec302a3481 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.glibc - stdenv.gcc.gcc + stdenv.cc.gcc libXv libXext libX11 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { fullPath=$fullPath''${fullPath:+:}$i/lib done - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$fullPath" $out/libexec/skype/skype cat > $out/bin/skype << EOF diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 8a3e7203f265..256b4a7ed3ab 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { mv ts3client_linux_${arch} ts3client echo "patching ts3client..." patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ --force-rpath \ ts3client ''; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 7a57cb8ad62c..be5f6d0037c7 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { mv ts3server_linux_${arch} ts3server echo "patching ts3server" patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ --force-rpath \ ts3server ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 55e5820a5d2b..c777a695924e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ updater do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/usr/lib/thunderbird-bin-${version}/$executable" done diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index a47d7bad4c9d..ba5cc85e5a4e 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 6ae68aea9ea3..8078ae1b6ff5 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 65ddd7305c83..8e42e8004c54 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"; -- cgit 1.4.1