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