Merge pull request #239781 from wineee/qttools

qttools: disable clang-based c++ parser by default

pkgs/development/libraries/qt-6/modules/qtdoc.nix

@@ -13,7 +13,7 @@ qtModule {
           --replace '$QT_INSTALL_DOCS' "${qtbase}/share/doc"
     done
   '';
-  nativeBuildInputs = [ qttools ];
+  nativeBuildInputs = [ (qttools.override { withClang = true; }) ];
   qtInputs = [ qtdeclarative ];
   cmakeFlags = [
     "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS"

pkgs/development/libraries/qt-6/modules/qttools.nix

@@ -3,13 +3,15 @@
 , lib
 , qtbase
 , qtdeclarative
-, llvmPackages
 , cups
+, llvmPackages
+# clang-based c++ parser for qdoc and lupdate
+, withClang ? false
 }:
 
 qtModule {
   pname = "qttools";
-  buildInputs = [
+  buildInputs = lib.optionals withClang [
     llvmPackages.libclang
     llvmPackages.llvm
   ];

pkgs/development/tools/qtcreator/qt6.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
+    (qttools.override { withClang = true; })
     wrapQtAppsHook
     python3
     ninja