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

unbound: fix cross-compilation #370087

Merged
merged 1 commit into from
Jan 4, 2025
Merged

unbound: fix cross-compilation #370087

merged 1 commit into from
Jan 4, 2025

Conversation

jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Jan 2, 2025

Due to a check in make-derivation.nix (https://github.com/nixos/nixpkgs/blob/e4f449ab51a283676d3b520c3dbaa3eafa5025b4/pkgs/stdenv/generic/make-derivation.nix#L288), nativeCheckInputs is not used. This causes cross-compilation for unbound to fail due to the programs in bison not being available.

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.

Due to a check in make-derivation.nix (https://github.com/nixos/nixpkgs/blob/e4f449ab51a283676d3b520c3dbaa3eafa5025b4/pkgs/stdenv/generic/make-derivation.nix#L288),
`nativeCheckInputs` is not used. This causes cross-compilation for
unbound to fail due to the programs in `bison` not being available.
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 2, 2025
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 2, 2025
@jackwilsdon jackwilsdon mentioned this pull request Jan 4, 2025
13 tasks
@brianmcgillion
Copy link
Contributor

verified to build on aarch64 and riscv targets

Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

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

LGTM

@zimbatm zimbatm merged commit a8f36e3 into NixOS:master Jan 4, 2025
24 of 25 checks passed
@xokdvium
Copy link
Contributor

xokdvium commented Jan 4, 2025

This was merged into staging some time ago: #364656

@zimbatm zimbatm mentioned this pull request Jan 4, 2025
13 tasks
@zimbatm
Copy link
Member

zimbatm commented Jan 4, 2025

thanks, I've pushed #370866 to make staging merge easier.

@jmbaur jmbaur deleted the unbound-cross branch January 4, 2025 16:58
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: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants