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.

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

edk2-uefi-shell: fix cross compilation #364044

Merged
merged 1 commit into from
Dec 11, 2024

Conversation

kuruczgy
Copy link
Contributor

This PYTHON_COMMAND workaround was introduced in #201095, but it does not seem to have caused issues so far, until the version update in bef3f40. Not sure why this was not an issue before this update and why it is now, but I think this fix makes sense regardless of the exact root cause, and I don't think it's worth the effort to dig further.

Things done

  • Built on platform(s)
    • x86_64-linux -> aarch64-linux cross
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

This PYTHON_COMMAND workaround was introduced in NixOS#201095, but it does
not seem to have caused issues so far, until the version update in
bef3f40. Not sure why this was not an
issue before this update and why it is now, but I think this fix makes
sense regardless of the exact root cause, and I don't think it's worth
the effort to dig further.
@github-actions github-actions bot added 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 labels Dec 10, 2024
@kuruczgy
Copy link
Contributor Author

Manual ping @LunNova @mjoerg (ofBorg is very slow...)

Copy link
Contributor

@mjoerg mjoerg left a comment

Choose a reason for hiding this comment

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

Thanks!

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 364044


x86_64-linux


aarch64-linux


x86_64-darwin


aarch64-darwin

Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

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

LGTM.

@bjornfor bjornfor merged commit 7251eb7 into NixOS:master Dec 11, 2024
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

3 participants