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

cross compilation fixes #225977

Merged
merged 4 commits into from
Apr 15, 2023
Merged

Conversation

uninsane
Copy link
Contributor

Description of changes

enables nix build '.#pkgsCross.aarch64-multiplatform.<package>' for the following packages:

  • libqmi
  • pam_mount
  • serf
  • subversion
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
  • Fits CONTRIBUTING.md.

serf consumes apr-util's apu-1-config file to obtain linker flags, so we extend the existing Makefile patch there to also apply to apu-1-config
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 13, 2023
@ofborg ofborg bot requested review from lovek323, NetaliDev, jtojnar and edolstra April 13, 2023 09:06
Copy link
Member

@lilyinstarlight lilyinstarlight left a comment

Choose a reason for hiding this comment

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

The changes seem sane and work for me for x86_64-linux -> aarch64-linux cross (rebuild count is >3k though so I did not check dependents aside from #225664)

@Artturin Artturin merged commit f13b89d into NixOS:staging Apr 15, 2023
@uninsane uninsane deleted the pr/sane/cross-2023-04-12-staging branch April 15, 2023 23:11
@alyssais alyssais mentioned this pull request Apr 18, 2023
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants