diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-06 17:16:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-06 17:18:56 +0200 |
| commit | 2a7910655eafc38272e5fd54dba155b892239c81 (patch) | |
| tree | 2d9fe4eb3caec96682d5381b6ddbf2ce03a1b3ae /pkgs | |
| parent | d6264f9094b93810ecec8e8fa4ab82c25ebaeddd (diff) | |
| download | nixlib-2a7910655eafc38272e5fd54dba155b892239c81.tar nixlib-2a7910655eafc38272e5fd54dba155b892239c81.tar.gz nixlib-2a7910655eafc38272e5fd54dba155b892239c81.tar.bz2 nixlib-2a7910655eafc38272e5fd54dba155b892239c81.tar.lz nixlib-2a7910655eafc38272e5fd54dba155b892239c81.tar.xz nixlib-2a7910655eafc38272e5fd54dba155b892239c81.tar.zst nixlib-2a7910655eafc38272e5fd54dba155b892239c81.zip | |
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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99b347a33c46..ca582ea8a629 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 { }; |