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

treewide: Mass replace 'boehmgc}/lib' to refer the 'out' output

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:29:00 +02:00
parent 79738a639a
commit d005808127
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.3/default.nix
View File

@ -143,7 +143,7 @@ stdenv.mkDerivation ({
postConfigure = ''
make configure-gcc
sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib}/lib@'
sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc}/lib -lgc@'
sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc.out}/lib -lgc@'
'';
} else {})
// (if langVhdl then rec {

4
pkgs/development/compilers/opendylan/bin.nix
View File

@ -24,10 +24,10 @@ stdenv.mkDerivation {
interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
for a in "$out"/bin/*; do
patchelf --set-interpreter "$interpreter" "$a"
patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done
for a in "$out"/lib/*.so; do
patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done
sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam
wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin