Skip to content

xnu: use python3Minimal instead of python3#234856

Closed
reckenrode wants to merge 1 commit intoNixOS:stagingfrom
reckenrode:xnu-fix
Closed

xnu: use python3Minimal instead of python3#234856
reckenrode wants to merge 1 commit intoNixOS:stagingfrom
reckenrode:xnu-fix

Conversation

@reckenrode
Copy link
Copy Markdown
Contributor

Description of changes

xnu does not require a Python that supports configd, so use a minimal one without support. Doing this prevents an infinite recuresion when building configd with xpc, which is needed to build with a newer LLVM.

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.

xnu does not require a Python that supports configd, so use a minimal
one without support. Doing this prevents an infinite recuresion when
building configd with xpc, which is needed to build with a newer LLVM.
@ofborg ofborg bot requested a review from copumpkin May 29, 2023 22:16
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels May 29, 2023
@wegank
Copy link
Copy Markdown
Member

wegank commented May 30, 2023

The change being in pkgs/os-specific/darwin/apple-sdk/default.nix, how does it affect darwin.xnu?

@reckenrode
Copy link
Copy Markdown
Contributor Author

Looks like I might have cherry-picked the wrong commit. Let me dig into this to see what happened and whether this one is even still necessary.

@reckenrode
Copy link
Copy Markdown
Contributor Author

I’m not sure what happened here. At one point while working on a configd fix, I ran into an infinite recursion. I thought I modified default.nix for xnu, but I obviously didn’t. I dropped this commit from my local branch, and it still doesn’t have an infinite recursion, so I guess that’s fine.

However, I do have an actual fix for xnu. It fails to build with newer clangs due needing -lc++abi on one of the programs it builds. I’m going to close this PR and push the correct one. Thanks for the catch!

@reckenrode reckenrode closed this May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants