plan9port: use C compiler from Nix #66404
Merged
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
The install script was escaping the Nix environment on Mac OS by using `xcrun -sdk macos clang` as its C compiler. Using the Nix compiler required declaring the necessary frameworks as inputs and patching build scripts to assume MacOS 10.12 (and not try to detect). So cached derivations prior to this would probably not work on all intended target machines. This *might* also fix installCheck on Darwin on Hydra. Other minor fixes: * Disable parallel building due to a race with a missing y.tab.h * Use NIX_CFLAGS_COMPILE/NIX_LDFLAGS instead of trying to synthesize something like them. * X11 dependencies aren't used on Darwin when the windowing system is correctly detected
|
Have you sent the CoreFoundation and TMPDIR patches upstream?
|
|
@alyssais yes, but no response ( 9fans/plan9port#272 and 9fans/plan9port#273 ) |
|
Another week, still no response from upstream. Any way to get this merged? |
|
Particularly I don't think we need to wait upstream to incorporate our patches. We can maintain them here and now. If the upstream accepts them, better! Edit: If in seven days no one objects, I will merge it. |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
@AndersonTorres it's been 15 days now, but also I just added a small adjustment so that packages that use 9l/9c don't need to have |
|
@eraserhd thanks! I will update it now! |
13 tasks
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.
The install script was escaping the Nix environment on Mac OS by using
xcrun -sdk macos clangas its C compiler. Using the Nix compiler required declaring the necessary frameworks as inputs and patching build scripts to assume MacOS 10.12 (and not try to detect).So cached derivations prior to this would probably not work on all intended target machines.
This should also fix installCheck on Darwin on Hydra.
Other minor fixes:
Motivation for this change
Making the Mac plan9port pure. On Darwin, the package now builds with correct clang 7
instead of Apple's clang 10.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @AndersonTorres @bbarker @ftrvxmtrx @KoviRobi (and @alyssais)