From d5937a80967073eac2b53072d59aeece4a18c52e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 10 Nov 2019 12:32:58 +0000 Subject: [PATCH] qt5/libsForQt5: Switch MacOS to Qt 5.12 by default Qt 5.11 does not build after the latest mesa update --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c274c71dc38..1b0e972b8fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13476,8 +13476,8 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); # TODO bump to 5.12 on darwin once it's not broken - qt5 = if stdenv.isDarwin then qt511 else qt512; - libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; + qt5 = qt512; + libsForQt5 = libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };