Skip to content

ninja: fix cross compilation#210149

Merged
superherointj merged 1 commit intoNixOS:stagingfrom
NickCao:ninja-cross
Feb 4, 2023
Merged

ninja: fix cross compilation#210149
superherointj merged 1 commit intoNixOS:stagingfrom
NickCao:ninja-cross

Conversation

@NickCao
Copy link
Copy Markdown
Member

@NickCao NickCao commented Jan 11, 2023

Description of changes

Fixes #202111

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/)
  • 23.05 Release Notes (or backporting 22.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.

@NickCao NickCao marked this pull request as draft January 11, 2023 03:30
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jan 11, 2023
@NickCao NickCao marked this pull request as ready for review January 11, 2023 04:05
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Jan 11, 2023
@ofborg ofborg bot requested review from bjornfor and thoughtpolice January 11, 2023 05:38
@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 11, 2023
RossComputerGuy pushed a commit to ExpidusOS-archive/sdk that referenced this pull request Jan 13, 2023
feat(pkgs): port NixOS/nixpkgs#210149
ab64b8e
@superherointj
Copy link
Copy Markdown
Contributor

superherointj commented Feb 3, 2023 •
edited
Loading

It's been 3 weeks. Would be nice to rebase this.

nixpkgs-review throws with error for packages hepmc3 (version 3.2.5) and root (pkgs/applications/science/misc/root). (Which don't build at staging.)

error: … while querying the derivation named 'hepmc3-3.2.5'

Then quits.

(I have set -b staging branch for nixpkgs-review, or else it would rebase to master, which would conflict.)

Note: This message is now outdated because of rebase.

superherointj
superherointj approved these changes Feb 4, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@superherointj superherointj 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.

I confirm this PR fixes ninja for cross compilation. Tested with .#pkgsCross.aarch64-multiplatform.ninja. Ninja also builds fine. Changes look safe code-wise. I have not tested downstream in a comprehensive manner as it is staging (can't build fully). But LGTM.

@superherointj superherointj merged commit 65f4af1 into NixOS:staging Feb 4, 2023
@NickCao NickCao deleted the ninja-cross branch February 4, 2023 22:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjornfor bjornfor Awaiting requested review from bjornfor

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

1 more reviewer

@superherointj superherointj superherointj approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 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-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@NickCao @superherointj