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

merged 1 commit into from
Jul 4, 2024

Conversation

reckenrode
Copy link
Contributor

Description of changes

After #322388, darwin.cctools is just Apple’s cctools again. The replacement for what the bootstrap tools wants is darwin.binutils-unwrapped.

Prevents a build failure on staging-next (#322145):

Confirmed freshBootstrapTools.test built successfully for both aarch64-darwin and x86_64-darwin.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@reckenrode
stdenv/darwin/make-bootstrap-tools.nix: use darwin.binutils-unwrapped
7550461 
After NixOS#322388, darwin.cctools is just Apple’s cctools again. The replacement for what the bootstrap tools wants is darwin.binutils-unwrapped.
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jul 4, 2024
paparodeo
paparodeo approved these changes Jul 4, 2024
View reviewed changes
Copy link
Contributor

@paparodeo paparodeo left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

confirmed nix-build -A freshBootstrapTools.test on x64 darwin

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 4, 2024
@reckenrode reckenrode merged commit b3f3846 into NixOS:staging-next Jul 4, 2024
10 of 11 checks passed
@reckenrode reckenrode deleted the make-bootstrap-tools-fix branch July 4, 2024 16:41
@reckenrode reckenrode mentioned this pull request Jul 6, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paparodeo paparodeo paparodeo approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: stdenv Standard environment 12.approvals: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@reckenrode @paparodeo @wegank