qt5: fix Darwin build for 5.9.2 #30404
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
LnL7
reviewed
Oct 15, 2017
| @@ -114,6 +115,10 @@ stdenv.mkDerivation { | |||
| --replace "/System/Library/Frameworks/OpenGL.framework/" "${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework/" | |||
| substituteInPlace ./mkspecs/common/mac.conf \ | |||
| --replace "/System/Library/Frameworks/AGL.framework/" "${darwin.apple_sdk.frameworks.AGL}/Library/Frameworks/AGL.framework/" | |||
| substituteInPlace ./mkspecs/common/mac.conf \ | |||
| --replace "-framework OpenGL" "${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework/OpenGL" | |||
There was a problem hiding this comment.
this looks a little strange, -framework Foo should work correctly when it's added as a dependency.
There was a problem hiding this comment.
Removed. I ran into some linking issue when build an app depends on qt. I guess the app itself need some change
j-hao
referenced
this pull request
Oct 18, 2017
LnL7
approved these changes
Oct 19, 2017
|
Awesome work! thanks @j-hao ! |
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
Upgrade to 5.9.2 broke Darwin build. This PR is to fix it and make sure qt5.full can build on Darwin
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)