Merged
Conversation
prusnak
approved these changes
Jan 1, 2021
Member
There was a problem hiding this comment.
I confirmed the patches do not apply on master when run on darwin (i.e. we need this PR to fix the build failure on master).
I confirmed the patches do apply in a61f20e when run on darwin and qt512 starts to build on darwin.
I have not tested the full build on darwin.
Member
Author
|
I'm still waiting on |
Contributor
|
Have not tested all deps, but this unblocks qtmultimedia 👍 |
10 tasks
Member
Author
|
I didn't find any new failures in the dependent packages. |
Member
|
I will let you know if I see any other darwin related failures in qt. |
ttuegel
added a commit
to ttuegel/nixpkgs
that referenced
this pull request
Jan 1, 2021
qt512: fix darwin patches (cherry picked from commit 43939ba)
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.
Motivation for this change
The patches for Qt 5.12 on Darwin no longer apply. Although I cannot test the build on macOS, I can make the Darwin patches apply on all platforms because the patches target only platform-specific files.
See also: #107483 (comment)
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)