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 {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b99342214425..f232122938e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19847,9 +19847,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;