mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 06:14:26 +03:00
make-bootstrap-tools: try again to fix on Darwin
For discussion see: https://github.com/NixOS/nixpkgs/commit/ac4958efc33322c9
This commit is contained in:
parent
debd401b0f
commit
1e2d0205a8
@ -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/*
|
||||
|
Loading…
Reference in New Issue
Block a user