From 2a7910655eafc38272e5fd54dba155b892239c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Sep 2019 17:16:18 +0200 Subject: [PATCH] qt5 on darwin: revert back to 5.11 5.12 has been broken again, nad libsForQt5 has never been switched anyway. This should unblock the nixpkgs channel. Discussion thread: https://github.com/NixOS/nixpkgs/pull/66266#issuecomment-523131781 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99b347a33c4..ca582ea8a62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13215,7 +13215,8 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - qt5 = qt512; + # 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; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };