diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-08-07 20:05:04 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-08-07 22:20:37 -0400 |
| commit | 0dc732130947f544576e92b857ae7840e8d6bb8f (patch) | |
| tree | eaa592bf11850d2829a1ebc6d088ad7556ea3285 | |
| parent | Merge pull request #185516 from r-ryantm/auto-update/kid3 (diff) | |
| download | nixpkgs-origin/revert-168524-qt-5.14-darwin.tar.gz | |
Revert "qt5, libsForQt5: 5.12 -> 5.14 on darwin"origin/revert-168524-qt-5.14-darwin
Also an ad-hoc eval fix.
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtlottie.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtlottie.nix b/pkgs/development/libraries/qt-5/modules/qtlottie.nix index d94c289953d0..7dfab4754037 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlottie.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlottie.nix @@ -6,4 +6,8 @@ qtModule { pname = "qtlottie"; qtInputs = [ qtbase qtdeclarative ]; + meta = { + # fix eval using release-lib.nix (lottie doesn't exist on qt512 that is used on darwin) + badPlatforms = [ "x86_64-darwin" "aarch64-darwin" ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54a82c162f71..42bcddba4dba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20810,9 +20810,10 @@ with pkgs; qt5 = qt515; }); - # TODO bump to 5.15 on darwin once it's not broken; see #125548 - qt5 = if stdenv.hostPlatform.isDarwin then qt514 else qt515; - libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt514 else libsForQt515; + # TODO bump to 5.14 on darwin once it works; see #185615 + # Also, qt514.qtwebengine is broken on darwin + qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515; + libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515; |