libsForQt5.qtbase: fix Darwin build by removing obsolete patches #351984
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
nix-owners
bot
requested review from
K900,
NickCao,
SuperSandro2000 and
ttuegel
reckenrode
reviewed
Oct 28, 2024
emilazy
force-pushed
the
push-ntsrvvzlmsxz
branch
2 times, most recently
from
18eb528 to
fc60175
Compare
Another existing bug exposed by 514b00c: the build system was interpolating an empty SDK directory and passing `-isysroot -g0`, eating a compiler flag and breaking the build now that we don’t pass a redundant `-isysroot` of our own. Thankfully, with the new SDK pattern, we don’t need to do any of this elaborate patching; just pointing it at the right tools from `xcbuild` lets it figure everything out itself.
There might be a nicer way to do this, but I don’t understand qmake.
emilazy
force-pushed
the
push-ntsrvvzlmsxz
branch
from
fc60175 to
3831685
Compare
|
This builds successfully on my |
|
ack |
|
Built |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/title-the-darwin-sdks-have-been-updated/55295/1 |
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.
Another existing bug exposed by 514b00c: the build system was interpolating an empty SDK directory and passing
-isysroot -g0, eating a compiler flag and breaking the build now that we don’t pass a redundant-isysrootof our own.Thankfully, with the new SDK pattern, we don’t need to do any of this elaborate patching; just pointing it at the right tools from
xcbuildlets it figure everything out itself.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.