diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-03 16:33:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-03 16:34:47 +0200 |
| commit | 1e2d0205a86acdd28195ab75feadb517ec66e0d5 (patch) | |
| tree | 8ab57ce901305df07cc952b58699ae9d79b1d6ca /pkgs/stdenv | |
| parent | debd401b0f8bedae10c368abd0cacf75ef7f6350 (diff) | |
| download | nixlib-1e2d0205a86acdd28195ab75feadb517ec66e0d5.tar nixlib-1e2d0205a86acdd28195ab75feadb517ec66e0d5.tar.gz nixlib-1e2d0205a86acdd28195ab75feadb517ec66e0d5.tar.bz2 nixlib-1e2d0205a86acdd28195ab75feadb517ec66e0d5.tar.lz nixlib-1e2d0205a86acdd28195ab75feadb517ec66e0d5.tar.xz nixlib-1e2d0205a86acdd28195ab75feadb517ec66e0d5.tar.zst nixlib-1e2d0205a86acdd28195ab75feadb517ec66e0d5.zip | |
make-bootstrap-tools: try again to fix on Darwin
For discussion see: https://github.com/NixOS/nixpkgs/commit/ac4958efc33322c9
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 43775d0350b8..09b7769dc459 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -10,6 +10,9 @@ rec { singleBinary = "symlinks"; }); + # Avoid debugging larger changes for now. + bzip2_ = bzip2.override (args: { linkStatic = true; }); + build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; @@ -51,7 +54,7 @@ rec { cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin - cp ${bzip2.bin}/bin/bzip2 $out/bin + cp ${bzip2_.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp -d ${xz.bin}/bin/xz $out/bin @@ -140,7 +143,7 @@ rec { cp ${stdenv.shell} $out/on-server/sh cp ${cpio}/bin/cpio $out/on-server cp ${coreutils_}/bin/mkdir $out/on-server - cp ${bzip2.bin}/bin/bzip2 $out/on-server + cp ${bzip2_.bin}/bin/bzip2 $out/on-server chmod u+w $out/on-server/* strip $out/on-server/* |