JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename occurrences of gcc.gcc to gcc.cc

Browse Source
This commit is contained in:
Eric Seidel 2015-01-14 20:44:00 -08:00
parent f3c6827373
commit 88eae46455
17 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/dnscrypt-proxy.nix
View File

@ -103,7 +103,7 @@ in
${pkgs.tzdata}/share/zoneinfo/** r,
${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
${pkgs.gcc.gcc}/lib/libssp.so.* mr,
${pkgs.gcc.cc}/lib/libssp.so.* mr,
${pkgs.libsodium}/lib/libsodium.so.* mr,
}
'')

2
nixos/modules/system/boot/stage-1.nix
View File

@ -46,7 +46,7 @@ let
cp -pv ${pkgs.glibc}/lib/libpthread.so.* $out/lib
cp -pv ${pkgs.glibc}/lib/librt.so.* $out/lib
cp -pv ${pkgs.glibc}/lib/libdl.so.* $out/lib
cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib
cp -pv ${pkgs.gcc.cc}/lib*/libgcc_s.so.* $out/lib
# Copy BusyBox.
cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/

2
pkgs/applications/misc/xca/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/xca" \
--prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib"
--prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib"
'';
buildInputs = [ openssl qt4 libtool gcc makeWrapper ];

2
pkgs/applications/networking/copy-com/default.nix
View File

@ -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" {} \;

2
pkgs/applications/networking/dropbox/default.nix
View File

@ -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" {} \;

2
pkgs/applications/networking/ike/default.nix
View File

@ -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
'';

2
pkgs/applications/science/math/mathematica/9.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
coreutils
fontconfig
freetype
gcc.gcc
gcc.cc
gcc.libc
glib
ncurses

2
pkgs/applications/science/math/mathematica/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
coreutils
fontconfig
freetype
gcc.gcc
gcc.cc
gcc.libc
glib
ncurses

2
pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
View File

@ -3,7 +3,7 @@
kde {
buildInputs = [ kdelibs libtool ];
preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}";
meta = {
description = "various KDE development utilities";

2
pkgs/development/compilers/ghcjs/default.nix
View File

@ -71,7 +71,7 @@ in cabal.mkDerivation (self: rec {
chmod -R u+w $topDir/shims
'';
postInstall = ''
PATH=$out/bin:${Cabal}/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${gcc.gcc}/lib64:$LD_LIBRARY_PATH \
PATH=$out/bin:${Cabal}/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${gcc.cc}/lib64:$LD_LIBRARY_PATH \
env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
--dev \
--with-cabal ${cabalInstall}/bin/cabal \

8
pkgs/development/tools/misc/ccache/default.nix
View File

@ -17,19 +17,19 @@ stdenv.mkDerivation {
links = extraConfig : (runCommand "ccache-links" { }
''
mkdir -p $out/bin
if [ -x "${gcc.gcc}/bin/gcc" ]; then
if [ -x "${gcc.cc}/bin/gcc" ]; then
cat > $out/bin/gcc << EOF
#!/bin/sh
${extraConfig}
exec ${ccache}/bin/ccache ${gcc.gcc}/bin/gcc "\$@"
exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@"
EOF
chmod +x $out/bin/gcc
fi
if [ -x "${gcc.gcc}/bin/g++" ]; then
if [ -x "${gcc.cc}/bin/g++" ]; then
cat > $out/bin/g++ << EOF
#!/bin/sh
${extraConfig}
exec ${ccache}/bin/ccache ${gcc.gcc}/bin/g++ "\$@"
exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@"
EOF
chmod +x $out/bin/g++
fi

4
pkgs/development/tools/misc/distcc/default.nix
View File

@ -44,7 +44,7 @@ let
links = extraConfig : (runCommand "distcc-links" { }
''
mkdir -p $out/bin
if [ -x "${gcc.gcc}/bin/gcc" ]; then
if [ -x "${gcc.cc}/bin/gcc" ]; then
cat > $out/bin/gcc << EOF
#!/bin/sh
${extraConfig}
@ -52,7 +52,7 @@ let
EOF
chmod +x $out/bin/gcc
fi
if [ -x "${gcc.gcc}/bin/g++" ]; then
if [ -x "${gcc.cc}/bin/g++" ]; then
cat > $out/bin/g++ << EOF
#!/bin/sh
${extraConfig}

2
pkgs/development/tools/selenium/server/default.nix
View File

@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${gcc.gcc}/lib/:${gcc.gcc}/lib64:${xlibs.libX11}/lib" \
--set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \
launchers/launcher-linux-${arch}
${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
'';

2
pkgs/stdenv/linux/default.nix
View File

@ -283,7 +283,7 @@ rec {
allowedRequisites = with stage4.pkgs;
[ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv
paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
];
overrides = pkgs: {

16
pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
View File

@ -162,12 +162,12 @@ rec {
cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep
# Copy what we need of GCC.
cp -d ${gcc.gcc.crossDrv}/bin/gcc $out/bin
cp -d ${gcc.gcc.crossDrv}/bin/cpp $out/bin
cp -d ${gcc.gcc.crossDrv}/bin/g++ $out/bin
cp -d ${gcc.gcc.crossDrv}/lib*/libgcc_s.so* $out/lib
cp -d ${gcc.gcc.crossDrv}/lib*/libstdc++.so* $out/lib
cp -rd ${gcc.gcc.crossDrv}/lib/gcc $out/lib
cp -d ${gcc.cc.crossDrv}/bin/gcc $out/bin
cp -d ${gcc.cc.crossDrv}/bin/cpp $out/bin
cp -d ${gcc.cc.crossDrv}/bin/g++ $out/bin
cp -d ${gcc.cc.crossDrv}/lib*/libgcc_s.so* $out/lib
cp -d ${gcc.cc.crossDrv}/lib*/libstdc++.so* $out/lib
cp -rd ${gcc.cc.crossDrv}/lib/gcc $out/lib
chmod -R u+w $out/lib
rm -f $out/lib/gcc/*/*/include*/linux
rm -f $out/lib/gcc/*/*/include*/sound
@ -175,9 +175,9 @@ rec {
rm -f $out/lib/gcc/*/*/include-fixed/asm
rm -rf $out/lib/gcc/*/*/plugin
#rm -f $out/lib/gcc/*/*/*.a
cp -rd ${gcc.gcc.crossDrv}/libexec/* $out/libexec
cp -rd ${gcc.cc.crossDrv}/libexec/* $out/libexec
mkdir $out/include
cp -rd ${gcc.gcc.crossDrv}/include/c++ $out/include
cp -rd ${gcc.cc.crossDrv}/include/c++ $out/include
chmod -R u+w $out/include
rm -rf $out/include/c++/*/ext/pb_ds
rm -rf $out/include/c++/*/ext/parallel

16
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -89,12 +89,12 @@ rec {
cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
# Copy what we need of GCC.
cp -d ${gcc.gcc}/bin/gcc $out/bin
cp -d ${gcc.gcc}/bin/cpp $out/bin
cp -d ${gcc.gcc}/bin/g++ $out/bin
cp -d ${gcc.gcc}/lib*/libgcc_s.so* $out/lib
cp -d ${gcc.gcc}/lib*/libstdc++.so* $out/lib
cp -rd ${gcc.gcc}/lib/gcc $out/lib
cp -d ${gcc.cc}/bin/gcc $out/bin
cp -d ${gcc.cc}/bin/cpp $out/bin
cp -d ${gcc.cc}/bin/g++ $out/bin
cp -d ${gcc.cc}/lib*/libgcc_s.so* $out/lib
cp -d ${gcc.cc}/lib*/libstdc++.so* $out/lib
cp -rd ${gcc.cc}/lib/gcc $out/lib
chmod -R u+w $out/lib
rm -f $out/lib/gcc/*/*/include*/linux
rm -f $out/lib/gcc/*/*/include*/sound
@ -102,11 +102,11 @@ rec {
rm -f $out/lib/gcc/*/*/include-fixed/asm
rm -rf $out/lib/gcc/*/*/plugin
#rm -f $out/lib/gcc/*/*/*.a
cp -rd ${gcc.gcc}/libexec/* $out/libexec
cp -rd ${gcc.cc}/libexec/* $out/libexec
chmod -R u+w $out/libexec
rm -rf $out/libexec/gcc/*/*/plugin
mkdir $out/include
cp -rd ${gcc.gcc}/include/c++ $out/include
cp -rd ${gcc.cc}/include/c++ $out/include
chmod -R u+w $out/include
rm -rf $out/include/c++/*/ext/pb_ds
rm -rf $out/include/c++/*/ext/parallel

8
pkgs/top-level/all-packages.nix
View File

@ -3248,8 +3248,8 @@ let
gcc48_multi =
if system == "x86_64-linux" then lowPrio (
wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.gcc.override {
stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.gcc);
wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.cc.override {
stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
profiledCompiler = false;
enableMultilib = true;
}))
@ -4613,7 +4613,7 @@ let
distccMasquerade = if stdenv.isDarwin
then null
else callPackage ../development/tools/misc/distcc/masq.nix {
gccRaw = gcc.gcc;
gccRaw = gcc.cc;
binutils = binutils;
};
@ -13163,7 +13163,7 @@ let
# this is to circumvent the bug with libgcc_s.so.1 which is
# not found when using thread
extraCmds = ''
LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib
LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.cc}/lib
export LD_LIBRARY_PATH
'';
};