Skip to content

Conversation

@pcc
Copy link
Contributor

@pcc pcc commented Apr 24, 2025

Fixes cross compiling to x86.

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/)
  • 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.

@nix-owners nix-owners bot requested a review from mweinelt April 24, 2025 01:24
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 24, 2025
@rhendric
Copy link
Member

Hey, awesome catch!

Since this is advertised as an x86(-64) assembler, is it something we should make optional based on architecture?

@pcc
Copy link
Contributor Author

pcc commented Apr 24, 2025

Hey, awesome catch!

Since this is advertised as an x86(-64) assembler, is it something we should make optional based on architecture?

That would make sense, done.

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Makes sense.

@wegank wegank added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 12.approvals: 1 This PR was reviewed and approved by one person. labels Apr 24, 2025
@mweinelt mweinelt self-assigned this Apr 24, 2025
@mweinelt mweinelt merged commit 1fa7523 into NixOS:master Apr 24, 2025
26 of 29 checks passed
@mweinelt
Copy link
Member

Thanks!

@vcunat
Copy link
Member

vcunat commented Apr 24, 2025

I guess we don't care for 24.11 in this case?

@mweinelt
Copy link
Member

Not strongly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants