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: Add mingw32 support #274540

Merged
merged 1 commit into from
Jan 13, 2024

Conversation

seanybaggins
Copy link
Contributor

@seanybaggins seanybaggins commented Dec 15, 2023

Description of changes

Added mingw32 hostPlatfrom build support.

Things done

Needed for #274274

  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@ajs124 ajs124 left a comment

Choose a reason for hiding this comment

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

can't this use lib.meta.availableOn? iirc that's the preferred pattern.

@seanybaggins
Copy link
Contributor Author

can't this use lib.meta.availableOn? iirc that's the preferred pattern.

Can you link to an example?

@seanybaggins
Copy link
Contributor Author

can't this use lib.meta.availableOn? iirc that's the preferred pattern.

Okay found an example. If you are asking about the withMakeWrapper option, I think the answer is no.

nix-repl> lib.meta.availableOn pkgsCross.mingw32.stdenv.hostPlatform pkgsCross.mingw32.makeWrapper
true

I think this response should be false. makeWrapper does not work when you try to target mingw. This is because bash is not a supported target for mingw32.

@seanybaggins
Copy link
Contributor Author

If I have addressed the comments in the PR, can this get merged? If not what else needs to be done for this to be accepted?

@seanybaggins seanybaggins requested a review from ajs124 January 2, 2024 17:33
@wegank wegank force-pushed the add-mingw32-support-unbound branch 3 times, most recently from 102bc55 to d4e07c8 Compare January 11, 2024 22:57
@wegank wegank force-pushed the add-mingw32-support-unbound branch from d4e07c8 to d81076b Compare January 11, 2024 22:57
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Jan 12, 2024
@seanybaggins
Copy link
Contributor Author

Did this get pushed to staging? Should I close this PR?

@wegank
Copy link
Member

wegank commented Jan 12, 2024

No, this isn't in staging.

@seanybaggins
Copy link
Contributor Author

I got confused. I wasn't aware that you were able to do a force push of a branch that existed in my fork. Thanks for setting me straight.

@wegank wegank requested review from ajs124 and removed request for ajs124 January 12, 2024 19:48
@Ericson2314 Ericson2314 changed the title Add mingw32 support unbound unbound: Add mingw32 support Jan 13, 2024
@Ericson2314 Ericson2314 merged commit 5c28294 into NixOS:master Jan 13, 2024
24 checks passed
@Ericson2314
Copy link
Member

This can be a separate PR to avoid staging, but someone should clean up this file using lib.{with,enable}Feature{,As}.

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: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants