treewide: remove references to deprecated darwin.Libsystem stub#400424
treewide: remove references to deprecated darwin.Libsystem stub#400424emilazy merged 5 commits intoNixOS:stagingfrom
darwin.Libsystem stub#400424Conversation
github-actions
bot
added
10.rebuild-darwin: 11-100
nix-owners
bot
requested review from
Skyb0rg007,
kamilchm,
numinit,
redvers,
thanegill,
thoughtpolice and
wegank
There is still a remaining warning:
ld: warning: object file (/nix/store/mn46c4sb8qcjmw6iy1dh9rivk8i8kg5d-ponyc-0.58.6/lib/pony/0.58.6/lib/native/libponyrt.a(except_try_catch.o)) was built for newer macOS version (15.0) than being linked (13.0)
but I suspect that might have to do with our toolchain’s target
triple or something and anyway I’ve spent more time on this than
I wanted to already. The package was broken beforehand so this is
an improvement.
That code path is only used for 32‐bit Darwin.
emilazy
force-pushed
the
push-qzkzvwtzzott
branch
from
03cac87 to
606076e
Compare
|
The changes to ponyc and ovftool look fine to me. I don't think the latest PRs to those packages change things with those. |
| # Locate standard headers like <unistd.h> | ||
| substituteInPlace base/runtime/config/gen-posix-names.sh \ | ||
| --replace "\$SDK_PATH/usr" "${Libsystem}" | ||
| ''; |
There was a problem hiding this comment.
This substitution is definitely necessary on MacOS, are you able to replace Libsystem with darwin.Libsystem or whatever the non-deprecated value is?
There was a problem hiding this comment.
I don’t think it is necessary. If you look at the source, it only applies to what they call x86-darwin, which to my understanding is the 32‐bit i686-darwin platform that we no longer support in Nixpkgs at all. The amd64-darwin path does XCODE_SDK_PATH=`xcrun --show-sdk-path`, which is exactly the correct thing to do, both with the native Apple toolchain and with the new Nixpkgs Darwin SDK pattern. I checked other parts of the build system too, and it seemed like they should all do the right thing on x86_64-darwin.
Note that darwin.Libsystem has been an empty stub package since 24.11, so insofar as this was necessary it would have been broken for an entire release cycle already.
There was a problem hiding this comment.
You’re right — it does work without the patch.
Skyb0rg007
left a comment
Skyb0rg007
left a comment
There was a problem hiding this comment.
Works on a friend’s Mac machine — all good from me
|
Thanks! |
3 participants
25.05 Darwin clean‐up, part n of ∞.
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.