From dc2e4ebdec4da496cff480eac05edf63ef00a853 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Sep 2025 23:13:58 +0300 Subject: [PATCH] qt6.qttools: pin LLVM 20 Qt 6.9 doesn't support LLVM 21. --- .../development/libraries/qt-6/modules/qttools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qttools/default.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix index fd68b6fd087e..48d36780fea6 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix @@ -6,16 +6,17 @@ qtbase, qtdeclarative, cups, - llvmPackages, + llvmPackages_20, # clang-based c++ parser for qdoc and lupdate withClang ? false, }: qtModule { pname = "qttools"; + # FIXME: update to LLVM 21 with Qt 6.10 buildInputs = lib.optionals withClang [ - llvmPackages.libclang - llvmPackages.llvm + llvmPackages_20.libclang + llvmPackages_20.llvm ]; propagatedBuildInputs = [ qtbase