diff options
author | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
commit | c45372f038bc89c69390bdbc6a4b0bfdb63b1423 (patch) | |
tree | dc8ebe44d7a1ad0dc01b938199db38ebc14fbdfb /pkgs/applications/networking | |
parent | acbf8eb5617bb601e81cdc783f941773032cf400 (diff) | |
parent | cfb29ab882323d379aba20a95020c7c24f883eae (diff) | |
download | nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.gz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.bz2 nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.lz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.xz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.zst nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.zip |
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/applications/networking')
15 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index e8e07f907ed8..b4766cee4347 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -36,7 +36,7 @@ let ''; patchPhase = let - rpaths = [ stdenv.cc.gcc ]; + rpaths = [ stdenv.cc.cc ]; 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 c9956497b109..0018f00a3662 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.cc.gcc + [ stdenv.cc.cc alsaLib atk cairo @@ -106,7 +106,7 @@ stdenv.mkDerivation { pulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.cc.gcc + stdenv.cc.cc ]; # "strip" after "patchelf" may break binaries. 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 826f35fa839d..bdccb932e1c3 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.cc.gcc + stdenv.cc.cc alsaLib pulseaudio dbus_glib @@ -76,11 +76,11 @@ stdenv.mkDerivation rec { cp opt/google/talkplugin/*.so $plugins for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do - patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.gcc xorg.libX11 ]}:${stdenv.cc.gcc}/lib64" $plugins/$i + patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.cc xorg.libX11 ]}:${stdenv.cc.cc}/lib64" $plugins/$i done for i in libgoogletalkremoting.so libnpo1d.so; do - patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.gcc}/lib64" $plugins/$i + patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.cc}/lib64" $plugins/$i done mkdir -p $out/libexec/google/talkplugin @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpathProgram}:${stdenv.cc.gcc}/lib64" \ + --set-rpath "${rpathProgram}:${stdenv.cc.cc}/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 eefae9d5dae8..bcd86a2fb30d 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.cc.gcc != null && stdenv.cc.libc != null; +assert stdenv.isLinux && stdenv.cc.cc.isGNU or false && stdenv.cc.libc != null; let mirror = http://get.geo.opera.com/pub/opera; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ stdenv.cc.gcc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE + [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig libXrender libuuid expat gstreamer libxml2 gst_plugins_base ] diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix index 0b0fc359a6be..9ef8caafa98d 100644 --- a/pkgs/applications/networking/copy-com/default.nix +++ b/pkgs/applications/networking/copy-com/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ "$out/${appdir}/CopyConsole" - RPATH=${gcc.gcc}/lib:$out/${appdir} + RPATH=${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" find "$out/${appdir}" -type f -a -perm +0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d55e2b18162b..d49162d07232 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ "$out/${appdir}/dropbox" - RPATH=${ldpath}:${gcc.gcc}/lib:$out/${appdir} + RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" find "$out/${appdir}" -type f -a -perm +0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 48f277ad4c98..56341b64d6ce 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${stdenv.glibc}/lib::${gcc.gcc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc}/lib::${gcc.cc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib" done ''; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index e759b3f88060..db24670d9699 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] - ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 083299b3dc52..bc9246d8845c 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.cc.gcc zlib + libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.cc zlib gnome.GConf libidn rtmpdump c-ares openldap ]; buildCommand = '' diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c2c69b0e2fbe..b9f9667ad3b6 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.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; + ] + ":${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; src = if stdenv.system == "x86_64-linux" then diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index a1ec302a3481..218e7303807b 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.cc.gcc + stdenv.cc.cc libXv libXext libX11 diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e2dbb6dbc2f8..be276a4cfa28 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.cc.gcc + [ stdenv.cc.cc gconf alsaLib at_spi2_atk @@ -100,7 +100,7 @@ stdenv.mkDerivation { nss pango ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.cc.gcc + stdenv.cc.cc ]; installPhase = diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index ba5cc85e5a4e..28b272045b7d 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.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); + [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); in stdenv.mkDerivation { name = "teamviewer-8.0.17147"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/teamviewer - 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-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/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 4b449497dcc0..9b272a618b53 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.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); + [ stdenv.cc.cc 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.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-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/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/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 8e42e8004c54..55a5beb5093f 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.cc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]); + [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wine ]); in stdenv.mkDerivation { name = "teamviewer-7.0.9377"; |