From 8630ef79dd4286221da7c01e0c8568bc896ba441 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 16 Aug 2022 18:26:00 -0400 Subject: [PATCH] qt5, libsForQt5: 5.14 -> 5.15 on darwin (#184560) --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70bfbece2ca8..bd7a49ef54fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20905,9 +20905,8 @@ with pkgs; qt5 = qt515; }); - # 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; + qt5 = qt515; + libsForQt5 = libsForQt515; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515;