Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stdenv/darwin/make-bootstrap-tools.nix: use darwin.binutils-unwrapped #324579

Merged
merged 1 commit into from
Jul 4, 2024
Merged

stdenv/darwin/make-bootstrap-tools.nix: use darwin.binutils-unwrapped #324579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkgs/stdenv/darwin/make-bootstrap-tools.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ rec {
NIX_LDFLAGS = (oa.NIX_LDFLAGS or "") + " -headerpad_max_install_names";
});

cctools_ = darwin.cctools;

# Avoid messing with libkrb5 and libnghttp2.
curl_ = curlMinimal.override (args: {
gssSupport = false;
Expand Down Expand Up @@ -112,7 +110,7 @@ rec {

# Copy binutils.
for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do
cp ${getBin cctools_}/bin/$i $out/bin
cp ${getBin darwin.binutils-unwrapped}/bin/$i $out/bin
done

# Copy coreutils, bash, etc.
Expand Down