tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
Missed gcc refs
Shea Levy
11 years ago
05edd656
28b6fb61
+29
-29
20 changed files
expand all
collapse all
unified
split
pkgs
applications
networking
mailreaders
thunderbird-bin
default.nix
remote
teamviewer
9.nix
office
zotero
firefox-bin
default.nix
build-support
gcc-wrapper-old
default.nix
development
compilers
chicken
default.nix
go
1.3.nix
julia
0.3.3.nix
mozart
binary.nix
interpreters
python
2.6
default.nix
2.7
default.nix
libraries
qt-5
default.nix
tools
atom-shell
default.nix
games
dwarf-fortress
default.nix
megaglest
default.nix
os-specific
linux
nvidia-x11
builder.sh
default.nix
ocz-toolbox
default.nix
prl-tools
default.nix
servers
monitoring
newrelic-sysmond
default.nix
tools
misc
trash-cli
default.nix
+2
-2
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
···
67
67
phases = "unpackPhase installPhase";
68
68
69
69
libPath = stdenv.lib.makeLibraryPath
70
70
-
[ stdenv.gcc.gcc
70
70
+
[ stdenv.cc.gcc
71
71
gconf
72
72
alsaLib
73
73
at_spi2_atk
···
100
100
nss
101
101
pango
102
102
] + ":" + stdenv.lib.makeSearchPath "lib64" [
103
103
-
stdenv.gcc.gcc
103
103
+
stdenv.cc.gcc
104
104
];
105
105
106
106
installPhase =
+2
-2
pkgs/applications/networking/remote/teamviewer/9.nix
···
5
5
topath = "${wineUnstable}/bin";
6
6
7
7
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
8
8
-
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
8
8
+
[ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
9
9
in
10
10
stdenv.mkDerivation {
11
11
name = "teamviewer-9.0.32150";
···
34
34
EOF
35
35
chmod +x $out/bin/teamviewer
36
36
37
37
-
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
37
37
+
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
38
38
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd
39
39
ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/
40
40
'';
+2
-2
pkgs/applications/office/zotero/firefox-bin/default.nix
···
70
70
phases = "unpackPhase installPhase";
71
71
72
72
libPath = stdenv.lib.makeLibraryPath
73
73
-
[ stdenv.gcc.gcc
73
73
+
[ stdenv.cc.gcc
74
74
alsaLib
75
75
atk
76
76
cairo
···
106
106
pulseaudio
107
107
systemd
108
108
] + ":" + stdenv.lib.makeSearchPath "lib64" [
109
109
-
stdenv.gcc.gcc
109
109
+
stdenv.cc.gcc
110
110
];
111
111
112
112
# "strip" after "patchelf" may break binaries.
+1
-1
pkgs/build-support/gcc-wrapper-old/default.nix
···
58
58
59
59
crossAttrs = {
60
60
shell = shell.crossDrv + shell.crossDrv.shellPath;
61
61
-
libc = stdenv.gccCross.libc;
61
61
+
libc = stdenv.ccCross.libc;
62
62
coreutils = coreutils.crossDrv;
63
63
binutils = binutils.crossDrv;
64
64
gcc = gcc.crossDrv;
+1
-1
pkgs/development/compilers/chicken/default.nix
···
53
53
for f in $out/bin/*
54
54
do
55
55
wrapProgram $f \
56
56
-
--prefix PATH : ${stdenv.gcc}/bin
56
56
+
--prefix PATH : ${stdenv.cc}/bin
57
57
done
58
58
'';
59
59
+1
-1
pkgs/development/compilers/go/1.3.nix
···
80
80
81
81
installPhase = ''
82
82
export CC=cc
83
83
-
'' + stdenv.lib.optionalString (stdenv ? gcc) ''
83
83
+
'' + stdenv.lib.optionalString (stdenv ? cc) ''
84
84
# http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html
85
85
# Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work"
86
86
# during tests:
+2
-2
pkgs/development/compilers/julia/0.3.3.nix
···
7
7
assert stdenv.isLinux;
8
8
9
9
let
10
10
-
realGcc = stdenv.gcc.gcc;
10
10
+
realGcc = stdenv.cc.gcc;
11
11
in
12
12
stdenv.mkDerivation rec {
13
13
pname = "julia";
···
108
108
109
109
patchShebangs . contrib
110
110
111
111
-
export PATH="$PATH:${stdenv.gcc.libc}/sbin"
111
111
+
export PATH="$PATH:${stdenv.cc.libc}/sbin"
112
112
113
113
# ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
114
114
# is probably not what we want anyway on non-NixOS
+1
-1
pkgs/development/compilers/mozart/binary.nix
···
14
14
};
15
15
16
16
libPath = stdenv.lib.makeLibraryPath
17
17
-
[stdenv.gcc.gcc emacs tk tcl boost gmp];
17
17
+
[stdenv.cc.gcc emacs tk tcl boost gmp];
18
18
19
19
builder = ./builder.sh;
20
20
+2
-2
pkgs/development/interpreters/python/2.6/default.nix
···
31
31
for i in /usr /sw /opt /pkg; do
32
32
substituteInPlace ./setup.py --replace $i /no-such-path
33
33
done
34
34
-
'' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) ''
34
34
+
'' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
35
35
for i in Lib/plat-*/regen; do
36
36
-
substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/
36
36
+
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
37
37
done
38
38
'' + optionalString stdenv.isCygwin ''
39
39
# On Cygwin, `make install' tries to read this Makefile.
+2
-2
pkgs/development/interpreters/python/2.7/default.nix
···
34
34
for i in /usr /sw /opt /pkg; do
35
35
substituteInPlace ./setup.py --replace $i /no-such-path
36
36
done
37
37
-
'' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) ''
37
37
+
'' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
38
38
for i in Lib/plat-*/regen; do
39
39
-
substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/
39
39
+
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
40
40
done
41
41
'' + optionalString stdenv.isCygwin ''
42
42
# On Cygwin, `make install' tries to read this Makefile.
+1
-1
pkgs/development/libraries/qt-5/default.nix
···
66
66
./0003-glib-2.32.patch
67
67
(substituteAll {
68
68
src = ./0004-dlopen-resolv.patch;
69
69
-
glibc = stdenv.gcc.libc;
69
69
+
glibc = stdenv.cc.libc;
70
70
})
71
71
(substituteAll {
72
72
src = ./0005-dlopen-gl.patch;
+1
-1
pkgs/development/tools/atom-shell/default.nix
···
6
6
atomEnv = buildEnv {
7
7
name = "env-atom";
8
8
paths = [
9
9
-
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
9
9
+
stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
10
10
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
11
11
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
12
12
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
+2
-2
pkgs/games/dwarf-fortress/default.nix
···
51
51
# Store the original hash for dwarf-therapist
52
52
echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig
53
53
# Fix rpath
54
54
-
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
54
54
+
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
55
55
cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
56
56
57
57
cp $permission $out/share/df_linux/nix_permission
···
85
85
done
86
86
87
87
# now run Dwarf Fortress!
88
88
-
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/
88
88
+
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/
89
89
90
90
export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
91
91
#export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing.
+1
-1
pkgs/games/megaglest/default.nix
···
8
8
name = "megaglest-lib-env";
9
9
paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext
10
10
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
11
11
-
stdenv.gcc.gcc glew mesa_glu mesa_drivers wxGTK ];
11
11
+
stdenv.cc.gcc glew mesa_glu mesa_drivers wxGTK ];
12
12
};
13
13
path-env = buildEnv {
14
14
name = "megaglest-path-env";
+1
-1
pkgs/os-specific/linux/nvidia-x11/builder.sh
···
51
51
52
52
for i in nvidia-settings nvidia-smi; do
53
53
cp $i $out/bin/$i
54
54
-
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
54
54
+
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
55
55
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
56
56
done
57
57
+2
-2
pkgs/os-specific/linux/nvidia-x11/default.nix
···
42
42
dontStrip = true;
43
43
44
44
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
45
45
-
cudaPath = makeLibraryPath [zlib stdenv.gcc.gcc];
45
45
+
cudaPath = makeLibraryPath [zlib stdenv.cc.gcc];
46
46
openclPath = makeLibraryPath [zlib];
47
47
-
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc];
47
47
+
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc];
48
48
49
49
programPath = optionalString (!libsOnly) (makeLibraryPath
50
50
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
+2
-2
pkgs/os-specific/linux/ocz-toolbox/default.nix
···
16
16
cd linux${arch}
17
17
'';
18
18
19
19
-
libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc libXrender fontconfig freetype libXext libX11 ];
19
19
+
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc libXrender fontconfig freetype libXext libX11 ];
20
20
21
21
installPhase = ''
22
22
install -Dm755 OCZToolbox $out/bin/OCZToolbox
23
23
patchelf \
24
24
-
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
24
24
+
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
25
25
--set-rpath "$libPath" \
26
26
$out/bin/OCZToolbox
27
27
'';
+1
-1
pkgs/os-specific/linux/prl-tools/default.nix
···
83
83
'';
84
84
85
85
libPath = with xorg;
86
86
-
stdenv.lib.makeLibraryPath ([ stdenv.gcc.gcc libXrandr libXext libX11 libXcomposite libXinerama ]
86
86
+
stdenv.lib.makeLibraryPath ([ stdenv.cc.gcc libXrandr libXext libX11 libXcomposite libXinerama ]
87
87
++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]);
88
88
89
89
desktops = map (x: substituteAll ({
+1
-1
pkgs/servers/monitoring/newrelic-sysmond/default.nix
···
14
14
installPhase = ''
15
15
mkdir -p $out/bin
16
16
install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond
17
17
-
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
17
17
+
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
18
18
$out/bin/nrsysmond
19
19
'';
20
20
+1
-1
pkgs/tools/misc/trash-cli/default.nix
···
19
19
src = ./nix-paths.patch;
20
20
df = "${coreutils}/bin/df";
21
21
python = "${python2}/bin/${python2.executable}";
22
22
-
libc = "${stdenv.gcc.libc}/lib/libc.so.6";
22
22
+
libc = "${stdenv.cc.libc}/lib/libc.so.6";
23
23
})
24
24
25
25
# Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3