-
-
Notifications
You must be signed in to change notification settings - Fork 17.5k
treewide: Remove use of apple_sdk framework stub paths #399040
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
treewide: Remove use of apple_sdk framework stub paths #399040
Conversation
cb54e4f to
5803db0
Compare
5803db0 to
28e3371
Compare
|
I've manually checked these packages on aarch64-darwin. Results are as follows: I've also checked for those already broken packages that failures are similar to what can be seen on hydra. So I hope this doesn't break anything that wasn't broken before. OpenSC can be cleaned up because it detects the right path for PSCS if configure option is not passed: bullet can be cleaned up more, need to remove patchPhase sections that tried to work around old SDK. |
|
Not sure if this commit / PR should have |
28e3371 to
22bdec6
Compare
|
The PR title should be treewide, but the changes should be in individual commits for individual packages. |
712c5a4 to
05b7ccf
Compare
|
I separated each package into a separate commit. I also split out more elaborate pieces out into individual PRs:
With these merged, we should have no packages using old apple_sdk stub paths in-tree. |
|
How come this is being removed? I remember the odin package requiring these inputs to compile on macos, has there been a recent change so that is not required anymore? |
Yes, the Darwin SDK has been fully reworked in #346043. The old-style SDKs were just no-op placeholders now. |
emilazy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great on the whole, thanks! Some nits.
|
smaret
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change in gi/gildas/package.nix looks good to me. Thanks!
05b7ccf to
4fe11b6
Compare
emilazy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, thanks! I plan to do a nixpkgs-review and then merge within a day or two. Some nits if you feel like addressing them before then, but I won’t block on them.
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
4fe11b6 to
10a73ad
Compare
Also, patched out all impure paths in the linker.cpp file for darwin. Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Note: jaxlib currently points to jaxlib-bin so this code is not utilized for regular jaxlib installations. Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
10a73ad to
d1ee8a7
Compare
emilazy
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, when I said I’d run nixpkgs-review I hadn’t looked at the rebuilds total. But I built every directly touched package on x86_64-darwin except for xorg.xorgserver (didn’t want to build on staging and too lazy to test it on top of the libAppleWM change, plus it was broken before anyway), bullet-roboschool (broken on x86_64-darwin), and gildas (just takes too long). Thank you!
This patch covers all packages that use stub paths in some way in their
build instructions.
(Except those listed in this comment.)
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.