pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #239781 from wineee/qttools

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

authored by Nick Cao and committed by GitHub 8d28f852 56e2c1a7

+6 -4
unified split
+1 -1
pkgs/development/libraries/qt-6/modules/qtdoc.nix
··· 13 13 --replace '$QT_INSTALL_DOCS' "${qtbase}/share/doc" 14 14 done 15 15 ''; 16 - nativeBuildInputs = [ qttools ]; 16 + nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; 17 17 qtInputs = [ qtdeclarative ]; 18 18 cmakeFlags = [ 19 19 "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS"
+4 -2
pkgs/development/libraries/qt-6/modules/qttools.nix
··· 3 3 , lib 4 4 , qtbase 5 5 , qtdeclarative 6 + , cups 6 7 , llvmPackages 7 - , cups 8 + # clang-based c++ parser for qdoc and lupdate 9 + , withClang ? false 8 10 }: 9 11 10 12 qtModule { 11 13 pname = "qttools"; 12 - buildInputs = [ 14 + buildInputs = lib.optionals withClang [ 13 15 llvmPackages.libclang 14 16 llvmPackages.llvm 15 17 ];
+1 -1
pkgs/development/tools/qtcreator/qt6.nix
··· 38 38 nativeBuildInputs = [ 39 39 cmake 40 40 pkg-config 41 - qttools 41 + (qttools.override { withClang = true; }) 42 42 wrapQtAppsHook 43 43 python3 44 44 ninja