From c55f61061e4f5c0676f158dc55c68867dd19a1f0 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 13 Apr 2022 17:17:26 -0400 Subject: [PATCH 1/2] libsForQt5.qt5.qtserialbus: enable for qt 5.14 --- pkgs/development/libraries/qt-5/5.14/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 15c85961adcf..2bb0695c8d06 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -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 {}; From a88af94894f31e6cce358e49610a6fcb5b4f6f13 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 13 Apr 2022 15:27:00 -0400 Subject: [PATCH 2/2] qt5, libsForQt5: 5.12 -> 5.14 on darwin --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27e83d8d1e77..ab34e7262689 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; + 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;