Merge pull request #53846 from NixOS/pr/qt5-darwin-fix

qt5: use 5.11 on darwin until it's fixed
This commit is contained in:
Thomas Tuegel 2019-01-12 10:22:35 -06:00 committed by GitHub
commit 4d2a989b7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12226,8 +12226,9 @@ in
libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
qt5 = qt512;
libsForQt5 = libsForQt512;
# 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 { };