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.

Sign up for GitHub

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

qt5, libsForQt5: 5.12 -> 5.14 on darwin #168524

Merged
merged 2 commits into from
Apr 14, 2022
Merged

qt5, libsForQt5: 5.12 -> 5.14 on darwin #168524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c55f610
libsForQt5.qt5.qtserialbus: enable for qt 5.14
willcohen Apr 13, 2022
a88af94
qt5, libsForQt5: 5.12 -> 5.14 on darwin
willcohen Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/development/libraries/qt-5/5.14/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ let
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
qtscript = callPackage ../modules/qtscript.nix {};
qtsensors = callPackage ../modules/qtsensors.nix {};
qtserialbus = callPackage ../modules/qtserialbus.nix {};
qtserialport = callPackage ../modules/qtserialport.nix {};
qtspeech = callPackage ../modules/qtspeech.nix {};
qtsvg = callPackage ../modules/qtsvg.nix {};
Expand Down
6 changes: 3 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19842,9 +19842,9 @@ with pkgs;
qt5 = qt515;
});

# TODO bump to 5.14 on darwin once it's not broken; see #95199
qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515;
libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515;
# TODO bump to 5.15 on darwin once it's not broken; see #125548
qt5 = if stdenv.hostPlatform.isDarwin then qt514 else qt515;
Copy link
Contributor

@jiegec jiegec Aug 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Qt 5.15 is working on both x86_64-darwin and aarch64-darwin now (as of #180327).

Build Status for libsForQt515.qtbase.aarch64-darwin on nixpkgs/staging-next
✔ qtbase-5.15.5 from 2022-07-30 - https://hydra.nixos.org/build/185784694
Build Status for libsForQt515.qtbase.x86_64-darwin on nixpkgs/staging-next
✔ qtbase-5.15.5 from 2022-07-30 - https://hydra.nixos.org/build/185777883

libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt514 else libsForQt515;

# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
plasma5Packages = libsForQt515;
Expand Down