tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
treewide: Use explicit 'dev' references to glibc
Tuomas Tynkkynen
9 years ago
c3bcb4e1
01f85740
+11
-11
8 changed files
expand all
collapse all
unified
split
pkgs
applications
audio
ardour
ardour3.nix
science
math
calc
default.nix
development
interpreters
python
cpython
3.6
default.nix
servers
monitoring
longview
default.nix
tools
admin
daemontools
default.nix
misc
calamares
default.nix
networking
tgt
default.nix
top-level
lua-packages.nix
+1
-1
pkgs/applications/audio/ardour/ardour3.nix
···
48
49
patchPhase = ''
50
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
51
-
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
52
patchShebangs ./tools/
53
'';
54
···
48
49
patchPhase = ''
50
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
51
+
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
52
patchShebangs ./tools/
53
'';
54
+1
-1
pkgs/applications/science/math/calc/default.nix
···
3
with stdenv.lib;
4
let
5
makeFlags = ''
6
-
INCDIR=${glibc}/include \
7
BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \
8
USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \
9
TERMCONTROL=-DUSE_TERMIOS \
···
3
with stdenv.lib;
4
let
5
makeFlags = ''
6
+
INCDIR=${glibc.dev}/include \
7
BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \
8
USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \
9
TERMCONTROL=-DUSE_TERMIOS \
+1
-1
pkgs/development/interpreters/python/cpython/3.6/default.nix
···
79
export MACOSX_DEPLOYMENT_TARGET=10.6
80
''}
81
82
-
substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc}/include
83
84
configureFlagsArray=( --enable-shared --with-threads
85
CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
···
79
export MACOSX_DEPLOYMENT_TARGET=10.6
80
''}
81
82
+
substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc.dev}/include
83
84
configureFlagsArray=( --enable-shared --with-threads
85
CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+2
-2
pkgs/servers/monitoring/longview/default.nix
···
43
mv Linode $out
44
ln -s ../Linode/Longview.pl $out/bin/longview
45
for h in syscall.h sys/syscall.h asm/unistd.h asm/unistd_32.h asm/unistd_64.h bits/wordsize.h bits/syscall.h; do
46
-
${perl}/bin/h2ph -d $out ${glibc}/include/$h
47
mkdir -p $out/usr/include/$(dirname $h)
48
-
mv $out${glibc}/include/''${h%.h}.ph $out/usr/include/$(dirname $h)
49
done
50
wrapProgram $out/Linode/Longview.pl --prefix PATH : ${perl}/bin:$out/bin \
51
--suffix PERL5LIB : $out/Linode --suffix PERL5LIB : $PERL5LIB \
···
43
mv Linode $out
44
ln -s ../Linode/Longview.pl $out/bin/longview
45
for h in syscall.h sys/syscall.h asm/unistd.h asm/unistd_32.h asm/unistd_64.h bits/wordsize.h bits/syscall.h; do
46
+
${perl}/bin/h2ph -d $out ${glibc.dev}/include/$h
47
mkdir -p $out/usr/include/$(dirname $h)
48
+
mv $out${glibc.dev}/include/''${h%.h}.ph $out/usr/include/$(dirname $h)
49
done
50
wrapProgram $out/Linode/Longview.pl --prefix PATH : ${perl}/bin:$out/bin \
51
--suffix PERL5LIB : $out/Linode --suffix PERL5LIB : $PERL5LIB \
+2
-2
pkgs/tools/admin/daemontools/default.nix
···
11
configurePhase = ''
12
cd ${name}
13
14
-
sed -ie '1 s_$_ -include ${glibc}/include/errno.h_' src/conf-cc
15
16
substituteInPlace src/Makefile \
17
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
18
19
sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
20
21
-
cat ${glibc}/include/errno.h
22
'';
23
24
buildPhase = ''
···
11
configurePhase = ''
12
cd ${name}
13
14
+
sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
15
16
substituteInPlace src/Makefile \
17
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
18
19
sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
20
21
+
cat ${glibc.dev}/include/errno.h
22
'';
23
24
buildPhase = ''
+1
-1
pkgs/tools/misc/calamares/default.nix
···
33
-i src/modules/locale/timezonewidget/localeconst.h \
34
-i src/modules/locale/SetTimezoneJob.cpp
35
36
-
sed -e 's,/usr/share/i18n/locales,${glibc}/share/i18n/locales,' \
37
-i src/modules/locale/timezonewidget/localeconst.h
38
39
sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \
···
33
-i src/modules/locale/timezonewidget/localeconst.h \
34
-i src/modules/locale/SetTimezoneJob.cpp
35
36
+
sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \
37
-i src/modules/locale/timezonewidget/localeconst.h
38
39
sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \
+2
-2
pkgs/tools/networking/tgt/default.nix
···
22
preConfigure = ''
23
sed -i 's|/usr/bin/||' doc/Makefile
24
sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile
25
-
sed -i 's|/usr/include/sys/|${stdenv.glibc}/include/sys/|' usr/Makefile
26
-
sed -i 's|/usr/include/linux/|${stdenv.glibc}/include/linux/|' usr/Makefile
27
'';
28
29
postInstall = ''
···
22
preConfigure = ''
23
sed -i 's|/usr/bin/||' doc/Makefile
24
sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile
25
+
sed -i 's|/usr/include/sys/|${stdenv.glibc.dev}/include/sys/|' usr/Makefile
26
+
sed -i 's|/usr/include/linux/|${stdenv.glibc.dev}/include/linux/|' usr/Makefile
27
'';
28
29
postInstall = ''
+1
-1
pkgs/top-level/lua-packages.nix
···
280
onigVariable = "ONIG_DIR=${oniguruma}";
281
gnuVariable = "GNU_INCDIR=${gnulib}/lib";
282
treVariable = "TRE_DIR=${tre}";
283
-
posixVariable = "POSIX_DIR=${glibc}";
284
in ''
285
sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \
286
-i Makefile
···
280
onigVariable = "ONIG_DIR=${oniguruma}";
281
gnuVariable = "GNU_INCDIR=${gnulib}/lib";
282
treVariable = "TRE_DIR=${tre}";
283
+
posixVariable = "POSIX_DIR=${glibc.dev}";
284
in ''
285
sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \
286
-i Makefile