stdenvBootstrapTools: in darwin, only run install_name_tool on Mach-O files#243440
Merged
wegank merged 1 commit intoNixOS:staging-nextfrom Jul 15, 2023
tjni:bootstrap-tools-test
Merged
stdenvBootstrapTools: in darwin, only run install_name_tool on Mach-O files#243440wegank merged 1 commit intoNixOS:staging-nextfrom tjni:bootstrap-tools-test
wegank merged 1 commit intoNixOS:staging-nextfrom
tjni:bootstrap-tools-test
Conversation
Member
|
We have an nixpkgs/pkgs/stdenv/generic/setup.sh Line 339 in 974afd4 |
Contributor
Author
|
Wow, that's a cool function. Thank you, @NickCao. |
12 tasks
wegank
approved these changes
Jul 15, 2023
This file contains hidden or 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
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.
Description of changes
The Darwin stdenv rework (#240433) switches
asto be the Clang assembler, but it is wrapped in a shell script. We need to update the Darwin bootstrap test to skip runninginstall_name_toolon it, since it fails when given a file that is not a Mach-O binary. The tests seem to pass regardless.I'm not sure I should be (or can) use thefilecommand for this purpose. Open to feedback on how to make this better.Relevant for staging-next: #241951
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/)