Skip to content

Comments

qt5.qtwebengine: don't override patches in qtModule#103258

Merged
veprbl merged 2 commits intoNixOS:masterfrom
veprbl:pr/qtwebengine_patches_fix
Nov 15, 2020
Merged

qt5.qtwebengine: don't override patches in qtModule#103258
veprbl merged 2 commits intoNixOS:masterfrom
veprbl:pr/qtwebengine_patches_fix

Conversation

@veprbl
Copy link
Member

@veprbl veprbl commented Nov 10, 2020

Motivation for this change

Fixes: #103230

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

veprbl added 2 commits November 9, 2020 15:36
@veprbl
qt5.qtwebengine: remove dead conditions for pre 5.12 support
aa08b8e 
This doesn't change the derivation.
@veprbl
qt5.qtwebengine: don't override patches in qtModule
ee2501f 
This fixes darwin build.

Fixes: 90db964 ('qt5.qtwebengine: fix build with bison-3.7')
@veprbl veprbl requested a review from ttuegel as a code owner November 10, 2020 02:15
@veprbl veprbl added the 9.needs: port to stable A PR needs a backport to the stable release. label Nov 10, 2020
@veprbl veprbl mentioned this pull request Nov 10, 2020
Merged
10 tasks
@ofborg ofborg bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Nov 10, 2020
@ofborg ofborg bot requested a review from matthewbauer November 10, 2020 02:25
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Nov 10, 2020
@worldofpeace
Copy link
Contributor

worldofpeace commented Nov 10, 2020

OMG is that better to read

@kfiz kfiz mentioned this pull request Nov 11, 2020
Closed
@veprbl
Copy link
Member Author

veprbl commented Nov 11, 2020

OMG is that better to read

What is the concern?

@veprbl veprbl merged commit 61c2ee3 into NixOS:master Nov 15, 2020
@veprbl veprbl deleted the pr/qtwebengine_patches_fix branch November 15, 2020 01:26
@veprbl veprbl restored the pr/qtwebengine_patches_fix branch November 15, 2020 01:26
@veprbl veprbl deleted the pr/qtwebengine_patches_fix branch November 15, 2020 01:26
@veprbl veprbl self-assigned this Nov 17, 2020
veprbl added a commit that referenced this pull request Nov 17, 2020
@veprbl
qt5.qtwebengine: remove dead conditions for pre 5.12 support
0bb89e1 
This doesn't change the derivation.

(cherry picked from commit aa08b8e)
cc #103258
veprbl added a commit that referenced this pull request Nov 17, 2020
@veprbl
qt5.qtwebengine: don't override patches in qtModule
8f5d93a 
This fixes darwin build.

Fixes: 90db964 ('qt5.qtwebengine: fix build with bison-3.7')
(cherry picked from commit ee2501f)
cc #103258
@veprbl veprbl added 8.has: port to stable This PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Nov 17, 2020
@veprbl veprbl restored the pr/qtwebengine_patches_fix branch December 1, 2020 16:46
@veprbl veprbl deleted the pr/qtwebengine_patches_fix branch December 1, 2020 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees

@veprbl veprbl

Labels

6.topic: qt/kde Object-oriented framework for GUI creation 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

qt5.qtwebengine does not build on darwin

2 participants

@veprbl @worldofpeace