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.

Sign up for GitHub

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

Jump to bottom

linux: fix cross-build dependencies #139710

Merged
merged 1 commit into from
Sep 28, 2021
Merged

linux: fix cross-build dependencies #139710

merged 1 commit into from
Sep 28, 2021

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Sep 28, 2021

This is untested but according to
#127922 (comment)

zlib is only used in the host build, which breaks cross-compilation if
not present.

Motivation for this change
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 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.

@Mic92
linux: fix cross-build dependencies
31f5b40 
This is untested but according to
NixOS#127922 (comment)

zlib is only used in the host build, which breaks cross-compilation if
not present.
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Sep 28, 2021
@Mic92 Mic92 mentioned this pull request Sep 28, 2021
Merged
11 tasks
@alyssais alyssais added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Sep 28, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 labels Sep 28, 2021
alyssais
alyssais approved these changes Sep 28, 2021
View reviewed changes
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

This fixes cross builds for me.

@alyssais alyssais merged commit c21ba4f into NixOS:master Sep 28, 2021
@lopsided98 lopsided98 mentioned this pull request Oct 9, 2021
Merged
12 tasks
@Mic92 Mic92 deleted the linux-cross branch November 20, 2022 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssais alyssais alyssais approved these changes

@Atemu Atemu Awaiting requested review from Atemu

@andresilva andresilva Awaiting requested review from andresilva

@moni-dz moni-dz Awaiting requested review from moni-dz

@davidak davidak Awaiting requested review from davidak

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: kernel The Linux kernel 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Mic92 @alyssais