Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt5.qtwebengine: fix on darwin (again) #56440

Merged
merged 3 commits into from Mar 27, 2019

Conversation

@veprbl
Copy link
Member

@veprbl veprbl commented Feb 26, 2019

This is a continuation of #53848 that fixes some of the breakage coming after #54986 and also fixes qt59.qtwebengine.

I'm trying to switch away from substituteInPlace to using patches to improve maintainability.

Things done

  • qt59.qtwebengine builds
  • qt511.qtwebengine builds
  • Test with qutebrowser
Copy link
Member

@matthewbauer matthewbauer left a comment

Looks okay. Make sure to backport it to release-19.03. I am hoping to get 10.12 SDK to master pretty soon but we might as well have this fixed until then.

@veprbl
Copy link
Member Author

@veprbl veprbl commented Mar 3, 2019

In the light of #56744 we don't need most of this. On master we would only need the "qt5.qtwebengine: disable platform check using patches". And, I guess, all of this can be backported to 19.03 if 10.12 SDK doesn't land there.

veprbl added 3 commits Mar 26, 2019
The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.

The patch for 5.12 is only tested to apply.
…ituteInPlace

qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)
This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.
@veprbl veprbl force-pushed the pr/qt5_qtwebengine_darwin_fix2 branch from 561eb12 to 0624deb Mar 27, 2019
@veprbl
Copy link
Member Author

@veprbl veprbl commented Mar 27, 2019

I think I will merge this tomorrow if there are no objections.

edit: ported to 19.03 in:
ecca42f
abbe01b
d3fecd1

18.09 in:
17ef55f
f72758d
1b61f95

@GrahamcOfBorg GrahamcOfBorg requested a review from matthewbauer Mar 27, 2019
@veprbl veprbl merged commit 9f889a4 into NixOS:master Mar 27, 2019
14 checks passed
@arcnmx arcnmx mentioned this pull request Jul 11, 2019
10 tasks
@veprbl veprbl deleted the pr/qt5_qtwebengine_darwin_fix2 branch Dec 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants