darwin.apple_sdk: remove print-reexports #182094
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 tasks
thefloweringash
changed the title
toonn
approved these changes
Jul 19, 2022
| while IFS= read -r -d $'\0' tbd; do | ||
| echo "checkTbdRexports: checking re-exports in $tbd" | ||
| rewrite-tbd -r "$NIX_STORE" "$tbd" | ||
| done < <(find $prefix -type f -name '*.tbd' -print0) |
There was a problem hiding this comment.
Any reason the hook uses a different style from the apple_sdk installPhase? Very minor issue, feel free to ignore.
There was a problem hiding this comment.
No good reason. I think this version with null delimiters is technically more correct. I've used this style in both.
Comment on lines
-303
to
-308
| ln -s libSystem.B.tbd $out/lib/libSystem.tbd | ||
|
|
||
| for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do | ||
| ln -s libSystem.tbd $out/lib/lib$name.tbd | ||
| done | ||
|
|
There was a problem hiding this comment.
Was this only necessary for print-reexports?
There was a problem hiding this comment.
It's a consequence of updating the darwin stubs to include NixOS/darwin-stubs#5. I'm not yet sure this is correct.
There was a problem hiding this comment.
Ah, right, I dropped them in this commit too, FWIW.
Unclear if this is still useful, given it's used in exactly one place.
Also includes the aliases/
thefloweringash
force-pushed
the
remove-print-reexports
branch
from
c43f246 to
8e24473
Compare
wegank
added
2.status: stale
stale
bot
removed
the
2.status: stale
wegank
added
the
2.status: stale
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to #181550. Not yet complete! Uses stubs from the no-prelink branch (NixOS/darwin-stubs#8).
Description of changes
Darwin support in nixpkgs uses textual api stubs (tbd files). These files refer to each other in "re-export" sections with absolute paths like
/System/Library/Foo.framework. We want the entire closure to refer to the corresponding version in the nix store.In the 10.12 SDK, this uses a spread out process of pre-mangling to stubs to have
@Foo@tokens which can then be easily replaced without parsing, andprint-reexportsto check that all referenced files exist. This requires only minimal shell in the bootstrap tools.In the 11.0 SDK, this uses a new tool called
rewrite-tbd(https://github.com/thefloweringash/rewrite-tbd), which has prefix mapping, constant mapping, and checks that all paths exist and are in the nix store. This requires no preprocessing, but requiresrewrite-tbdin the bootstrap tools.The
rewrite-tbdmethod also usespassthru.tbdRewritesattributes from dependencies, which makes fewer assumptions about which dependencies own which files.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes