From d6cb6539a05a0b05ad1091a350dbbbb7a58a64b2 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 26 Jun 2023 00:18:34 +0800 Subject: [PATCH 1/2] qttools: disable clang-based c++ parser by default --- pkgs/development/libraries/qt-6/modules/qttools.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index 7d13e9a03e5c..adca87550cca 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/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 ]; From 4e5204700c6933e6116a8d5dbb059890f11562d2 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 26 Jun 2023 22:56:51 +0800 Subject: [PATCH 2/2] qtdoc/qtcreator: use qttools with clang support --- pkgs/development/libraries/qt-6/modules/qtdoc.nix | 2 +- pkgs/development/tools/qtcreator/qt6.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 004a18f53c78..3bbe39e5ee20 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/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" diff --git a/pkgs/development/tools/qtcreator/qt6.nix b/pkgs/development/tools/qtcreator/qt6.nix index 1d61966386f4..25d056917e43 100644 --- a/pkgs/development/tools/qtcreator/qt6.nix +++ b/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