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

Jump to bottom

[staging-next] qtlocation: fix build with Qt < 5.15 #108050

Merged
merged 1 commit into from Jan 3, 2021
Merged

[staging-next] qtlocation: fix build with Qt < 5.15 #108050

merged 1 commit into from Jan 3, 2021

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Dec 31, 2020

Motivation for this change

Fixes Qt Location 5.12 and 5.14. See #107783.

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.

@ttuegel ttuegel requested a review from FRidh December 31, 2020 14:58
@FRidh
Copy link
Member

FRidh commented Dec 31, 2020

see also #107991

@ttuegel
Copy link
Member Author

ttuegel commented Jan 2, 2021

As opposed to the other pull request, this one patches both files that need it and it fixes both Qt 5.12 and Qt 5.14.

@FRidh FRidh changed the base branch from staging-next to master January 3, 2021 09:00
@FRidh FRidh merged commit 9c04596 into NixOS:master Jan 3, 2021
@jonringer jonringer mentioned this pull request Jan 12, 2021
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ttuegel @FRidh