diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-13 16:28:09 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-13 17:22:55 +0300 |
| commit | 1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0 (patch) | |
| tree | 3f905e95266fcf6613b6b2518c0aa4267c2c1841 /pkgs/stdenv | |
| parent | 09a9a472ee783b40c2a3dd287bbe9d3c60f8fc58 (diff) | |
| download | nixlib-1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.tar nixlib-1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.tar.gz nixlib-1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.tar.bz2 nixlib-1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.tar.lz nixlib-1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.tar.xz nixlib-1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.tar.zst nixlib-1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0.zip | |
make-bootstrap-tools.nix: Fix bzip2
Apparently our native bzip2 builds switched to using dynamic libraries at some point.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 1a762bd87c79..613edfafd954 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -221,8 +221,7 @@ rec { # GCC has certain things built in statically. See # pkgs/stdenv/linux/default.nix for the details. 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 # Copy binutils. diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 42015a79a3e0..2ce73eb781d8 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -122,6 +122,8 @@ rec { cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib + # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin |