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, libsForQt5: 5.14 -> 5.15 on darwin #184560

Merged
merged 1 commit into from
Aug 16, 2022
Merged

Conversation

willcohen
Copy link
Contributor

Description of changes

Per https://github.com/NixOS/nixpkgs/pull/168524/files#r934306285, qt515 is ready to become the default on macos. I don't have an x86 mac anymore, so I can't test personally.

@veprbl @jiegec

Things done

Bumped qt514 to qt515.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Aug 1, 2022
@willcohen
Copy link
Contributor Author

This doesn't appear quite ready for merge. At the very least, my attempt to build qt5 on aarch64 is failing with qtspeech. @jiegec

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Aug 1, 2022
@veprbl
Copy link
Member

veprbl commented Aug 1, 2022

The Qt 5.14 was always ready but not fully ready for x86_64-darwin. The qt514.qtwebengine requires some Metal extensions that are hard to patch out for 10.12 SDK.

@willcohen
Copy link
Contributor Author

Of course -- sorry, haven't had my coffee yet. Right, and put more literally for the purpose of this PR, qt514 fails to build on darwin too, for the reasons mentioned above.

Can any x86 users put this through its paces? @NixOS/darwin-maintainers. As noted above, I've moved on to the land of apple silicon, so I can't test this where it counts.

@prusnak
Copy link
Member

prusnak commented Aug 1, 2022

The reason why qt5 was kept at qt5.12 on darwin was that qt5.qtwebengine is broken on x86_64-darwin for qt5.14+ as per

# we are still stuck with MacOS SDK 10.12 on x86_64-darwin
# and qtwebengine 5.14+ requires at least SDK 10.14
# (qtwebengine 5.12 is fine with SDK 10.12)
# on aarch64-darwin we are already at MacOS SDK 11.0
broken = stdenv.isDarwin && stdenv.isx86_64 && (lib.versionAtLeast qtCompatVersion "5.14");

Since it seems qt5 was bumped to qt5.14, the default qt5.qtwebengine is already broken on x86_64-darwin and therefore we don't lose anything by bumping to qt5.15 (where qtwebengine is broken too).

@willcohen willcohen changed the title [WIP] qt5, libsForQt5: 5.14 -> 5.15 on darwin qt5, libsForQt5: 5.14 -> 5.15 on darwin Aug 1, 2022
@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Aug 2, 2022
@willcohen willcohen requested a review from ttuegel August 2, 2022 16:58
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make sure this works in runtime: #185615

@willcohen
Copy link
Contributor Author

@veprbl if the last bump caused a regression a revert is absolutely the right move, and I’ll move this to draft. Sorry for the mixup.

@willcohen willcohen marked this pull request as draft August 8, 2022 01:50
@NickCao NickCao mentioned this pull request Aug 14, 2022
13 tasks
@tanshihaj
Copy link
Contributor

@willcohen @veprbl according reports in #185615 issue affects Qt 5.14, but not Qt 5.15 So maybe bumping to 5.15 will fix it?

@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python 6.topic: qt/kde labels Aug 14, 2022
@veprbl veprbl changed the base branch from staging to master August 14, 2022 16:55
@github-actions github-actions bot removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python 6.topic: qt/kde labels Aug 14, 2022
@bobby285271 bobby285271 added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Aug 16, 2022
@veprbl veprbl merged commit 8630ef7 into NixOS:master Aug 16, 2022
@willcohen willcohen deleted the qt-5.15-darwin branch July 12, 2024 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

qt5 applications broken on darwin qt5base: apple silicon: fails to build
5 participants