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

waf: fix cross-compiling by not overriding python in all-packages.nix #141821

Merged
merged 3 commits into from
Oct 16, 2021

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Oct 15, 2021

instead use python3 explicitly in the expression

the issue is caused by #49526

Motivation for this change

Supersedes #107000

Things done

Tested cross with nix build ".#pkgsCross.aarch64-multiplatform.waf"

  • 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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

@r-burns
Copy link
Contributor

r-burns commented Oct 16, 2021

LGTM. Would setting strictDeps help avoid regressions?

@Artturin Artturin changed the title waf: fix cross compiling by not overriding python in all-packages.nix waf: fix cross-compiling by not overriding python in all-packages.nix Oct 16, 2021
@Artturin
Copy link
Member Author

LGTM. Would setting strictDeps help avoid regressions?

yes i think so.

@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Oct 16, 2021
@Artturin
Copy link
Member Author

@ofborg eval

@Mindavi
Copy link
Contributor

Mindavi commented Oct 16, 2021

Diff LGTM. Consider cross-building one of the packages that depend on this as well (they will of course run the compiler on the build platform, but it's a good sanity check), e.g. by applying this patch: #140292

@SuperSandro2000 SuperSandro2000 merged commit 2736cee into NixOS:staging Oct 16, 2021
@Artturin Artturin deleted the wafcross branch October 16, 2021 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants