alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Missed gcc refs

Browse source
This commit is contained in:
Shea Levy 2014-12-26 12:28:15 -05:00
parent 28b6fb61e6
commit 05edd656f6
20 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View file

@ -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 =

4
pkgs/applications/networking/remote/teamviewer/9.nix
View file

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

4
pkgs/applications/office/zotero/firefox-bin/default.nix
View file

@ -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.

2
pkgs/build-support/gcc-wrapper-old/default.nix
View file

@ -58,7 +58,7 @@ stdenv.mkDerivation {
crossAttrs = {
shell = shell.crossDrv + shell.crossDrv.shellPath;
libc = stdenv.gccCross.libc;
libc = stdenv.ccCross.libc;
coreutils = coreutils.crossDrv;
binutils = binutils.crossDrv;
gcc = gcc.crossDrv;

2
pkgs/development/compilers/chicken/default.nix
View file

@ -53,7 +53,7 @@ stdenv.mkDerivation {
for f in $out/bin/*
do
wrapProgram $f \
--prefix PATH : ${stdenv.gcc}/bin
--prefix PATH : ${stdenv.cc}/bin
done
'';

2
pkgs/development/compilers/go/1.3.nix
View file

@ -80,7 +80,7 @@ stdenv.mkDerivation {
installPhase = ''
export CC=cc
'' + stdenv.lib.optionalString (stdenv ? gcc) ''
'' + stdenv.lib.optionalString (stdenv ? cc) ''
# http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html
# Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work"
# during tests:

4
pkgs/development/compilers/julia/0.3.3.nix
View file

@ -7,7 +7,7 @@
assert stdenv.isLinux;
let
realGcc = stdenv.gcc.gcc;
realGcc = stdenv.cc.gcc;
in
stdenv.mkDerivation rec {
pname = "julia";
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
patchShebangs . contrib
export PATH="$PATH:${stdenv.gcc.libc}/sbin"
export PATH="$PATH:${stdenv.cc.libc}/sbin"
# ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
# is probably not what we want anyway on non-NixOS

2
pkgs/development/compilers/mozart/binary.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
libPath = stdenv.lib.makeLibraryPath
[stdenv.gcc.gcc emacs tk tcl boost gmp];
[stdenv.cc.gcc emacs tk tcl boost gmp];
builder = ./builder.sh;

4
pkgs/development/interpreters/python/2.6/default.nix
View file

@ -31,9 +31,9 @@ let
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
'' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) ''
'' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
for i in Lib/plat-*/regen; do
substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
done
'' + optionalString stdenv.isCygwin ''
# On Cygwin, `make install' tries to read this Makefile.

4
pkgs/development/interpreters/python/2.7/default.nix
View file

@ -34,9 +34,9 @@ let
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
'' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) ''
'' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
for i in Lib/plat-*/regen; do
substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
done
'' + optionalString stdenv.isCygwin ''
# On Cygwin, `make install' tries to read this Makefile.

2
pkgs/development/libraries/qt-5/default.nix
View file

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
./0003-glib-2.32.patch
(substituteAll {
src = ./0004-dlopen-resolv.patch;
glibc = stdenv.gcc.libc;
glibc = stdenv.cc.libc;
})
(substituteAll {
src = ./0005-dlopen-gl.patch;

2
pkgs/development/tools/atom-shell/default.nix
View file

@ -6,7 +6,7 @@ let
atomEnv = buildEnv {
name = "env-atom";
paths = [
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr

4
pkgs/games/dwarf-fortress/default.nix
View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
# Store the original hash for dwarf-therapist
echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig
# Fix rpath
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
cp $permission $out/share/df_linux/nix_permission
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
done
# now run Dwarf Fortress!
export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/
export LD_LIBRARY_PATH=\${stdenv.cc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/
export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
#export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing.

2
pkgs/games/megaglest/default.nix
View file

@ -8,7 +8,7 @@ let
name = "megaglest-lib-env";
paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
stdenv.gcc.gcc glew mesa_glu mesa_drivers wxGTK ];
stdenv.cc.gcc glew mesa_glu mesa_drivers wxGTK ];
};
path-env = buildEnv {
name = "megaglest-path-env";

2
pkgs/os-specific/linux/nvidia-x11/builder.sh
View file

@ -51,7 +51,7 @@ installPhase() {
for i in nvidia-settings nvidia-smi; do
cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done

4
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -42,9 +42,9 @@ stdenv.mkDerivation {
dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.gcc.gcc];
cudaPath = makeLibraryPath [zlib stdenv.cc.gcc];
openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc];
programPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );

4
pkgs/os-specific/linux/ocz-toolbox/default.nix
View file

@ -16,12 +16,12 @@ in stdenv.mkDerivation rec {
cd linux${arch}
'';
libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc libXrender fontconfig freetype libXext libX11 ];
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc libXrender fontconfig freetype libXext libX11 ];
installPhase = ''
install -Dm755 OCZToolbox $out/bin/OCZToolbox
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$libPath" \
$out/bin/OCZToolbox
'';

2
pkgs/os-specific/linux/prl-tools/default.nix
View file

@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
'';
libPath = with xorg;
stdenv.lib.makeLibraryPath ([ stdenv.gcc.gcc libXrandr libXext libX11 libXcomposite libXinerama ]
stdenv.lib.makeLibraryPath ([ stdenv.cc.gcc libXrandr libXext libX11 libXcomposite libXinerama ]
++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]);
desktops = map (x: substituteAll ({

2
pkgs/servers/monitoring/newrelic-sysmond/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/bin/nrsysmond
'';

2
pkgs/tools/misc/trash-cli/default.nix
View file

@ -19,7 +19,7 @@ python2Packages.buildPythonPackage rec {
src = ./nix-paths.patch;
df = "${coreutils}/bin/df";
python = "${python2}/bin/${python2.executable}";
libc = "${stdenv.gcc.libc}/lib/libc.so.6";
libc = "${stdenv.cc.libc}/lib/libc.so.6";
})
# Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3