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

make-bootstrap-tools.nix: Fix bzip2

Browse Source 
Apparently our native bzip2 builds switched to using dynamic libraries at some point.
This commit is contained in:
Tuomas Tynkkynen 2017-04-13 16:28:09 +03:00
parent 09a9a472ee
commit 1f32d4b4eb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,8 +221,7 @@ rec {
# GCC has certain things built in statically. See # GCC has certain things built in statically. See
# pkgs/stdenv/linux/default.nix for the details. # pkgs/stdenv/linux/default.nix for the details.
cp -d ${isl}/lib/libisl*.so* $out/lib cp -d ${isl}/lib/libisl*.so* $out/lib
# Also this is needed since bzip2 uses a custom build system
# for native builds but autoconf (via a patch) for cross builds
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
# Copy binutils. # Copy binutils.

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

@ -122,6 +122,8 @@ rec {
cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
# Copy binutils. # Copy binutils.
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.out}/bin/$i $out/bin cp ${binutils.out}/bin/$i $out/bin