Skip to content

Comments

[staging-next] libredirect: fix build for aarch64-darwin#156460

Merged
vcunat merged 2 commits intoNixOS:staging-nextfrom
jonringer:fix-libredirect-darwin
Jan 24, 2022
Merged

[staging-next] libredirect: fix build for aarch64-darwin#156460
vcunat merged 2 commits intoNixOS:staging-nextfrom
jonringer:fix-libredirect-darwin

Conversation

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 24, 2022

Motivation for this change

Fix failing build for m1 mac

related: #154708
closes: #152667

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 24, 2022
@angerman
Copy link
Contributor

Going to validate this on monterey, let's see. Would be nice if this is the right fix.

@angerman
Copy link
Contributor

Ohh. Good catch @jonringer!

Avoid mass rebuild on other systems,
as staging-next has binaries already.
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 24, 2022
@vcunat vcunat merged commit 4bde5a3 into NixOS:staging-next Jan 24, 2022
@vcunat
Copy link
Member

vcunat commented Jan 24, 2022

OfBorg also succeeded the aarch64-darwin build, and other rebuilds got eliminated, so let's get Hydra to work on this to unblock staging-next soon.

@github-actions
Copy link
Contributor

Successfully created backport PR #156839 for staging-21.11.

vcunat added a commit that referenced this pull request Jan 26, 2022
(cherry picked from commit 4bde5a3 / PR #156460)

Co-authored-by: Jonathan Ringer <jonringer117@gmail.com>
Co-authored-by: Vladimír Čunát <v@cunat.cz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

libredirect fails to build on aarch64-darwin

3 participants