From 96745f0228359a71051a1d0bda4080e7ec134ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 14 Aug 2020 18:21:53 +0200 Subject: [PATCH] qt5: switch back to 5.12 on darwin ... until issue #95199 is fixed. --- 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 be52fcb2262..0f674eb0241 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14623,9 +14623,9 @@ in libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); - # TODO bump to 5.12 on darwin once it's not broken - qt5 = qt514; - libsForQt5 = libsForQt514; + # TODO bump to 5.14 on darwin once it's not broken; see #95199 + qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt514; + libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt514; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };