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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:28:57 +02:00
parent f412f5f3ee
commit c2ceed1ad1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,7 @@ rec {
for i in as ld ar ranlib nm strip readelf objdump; do for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils}/bin/$i $out/bin cp ${binutils}/bin/$i $out/bin
done done
cp -d ${binutils}/lib/lib*.so* $out/lib cp -d ${binutils.out}/lib/lib*.so* $out/lib
chmod -R u+w $out chmod -R u+w $out

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

@ -121,7 +121,7 @@ rec {
for i in as ld ar ranlib nm strip readelf objdump; do for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils}/bin/$i $out/bin cp ${binutils}/bin/$i $out/bin
done done
cp -d ${binutils}/lib/lib*.so* $out/lib cp -d ${binutils.out}/lib/lib*.so* $out/lib
chmod -R u+w $out chmod -R u+w $out

2
pkgs/top-level/python-packages.nix
View File

@ -15067,7 +15067,7 @@ in modules // {
preConfigure = '' preConfigure = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace '"/usr/include"' '"${pkgs.gdb}/include"' \ --replace '"/usr/include"' '"${pkgs.gdb}/include"' \
--replace '"/usr/lib"' '"${pkgs.binutils}/lib"' --replace '"/usr/lib"' '"${pkgs.binutils.out}/lib"'
''; '';
meta = { meta = {