mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
6365fa1eb9
Clang code model provides user with services: code completion, syntactic and semantic highlighting, diagnostics, outline of symbols, tooltips, renaming of local symbols. It's naturally depends on llvm and clang. To make it work with nixos: 1. Add qt version of clang as build dependency. 2. Added patch for clang libc++ regexp trunk regexp not including path like "libc++-version". 3. Fixed paths to llvm/clang libraries and includes. 4. Fixed name of clazy clang plugin.
16 lines
913 B
Diff
16 lines
913 B
Diff
diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
|
|
index b514c46..5f96358 100644
|
|
--- a/src/plugins/cpptools/headerpathfilter.cpp
|
|
+++ b/src/plugins/cpptools/headerpathfilter.cpp
|
|
@@ -92,8 +92,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs)
|
|
{
|
|
// include/c++, include/g++, libc++\include and libc++abi\include
|
|
static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))"
|
|
- R"(|(.*libc\+\+\/include))"
|
|
- R"(|(.*libc\+\+abi\/include))";
|
|
+ R"(|(.*libc\+\+.*\/include))"
|
|
+ R"(|(.*libc\+\+abi.*\/include))";
|
|
static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
|
|
|
|
// The same as includeRegExp but also matches /usr/local/include
|