diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/ccls/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/ccls/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index 06f3723509f5..bd753016fc8b 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-jipSipgD0avd7XODlpxnqjHK3s6nacaxbIQIddix7X8="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ]; + nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; + buildInputs = with llvmPackages; [ libclang llvm rapidjson ]; cmakeFlags = [ "-DCCLS_VERSION=${version}" ]; @@ -21,17 +21,11 @@ stdenv.mkDerivation rec { cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti") ''; + clang = llvmPackages.clang; shell = runtimeShell; - postFixup = '' - # We need to tell ccls where to find the standard library headers. - - standard_library_includes="\\\"-isystem\\\", \\\"${lib.getDev stdenv.cc.libc}/include\\\"" - standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" - export standard_library_includes - - wrapped=".ccls-wrapped" - export wrapped + postFixup = '' + export wrapped=".ccls-wrapped" mv $out/bin/ccls $out/bin/$wrapped substituteAll ${./wrapper} $out/bin/ccls chmod --reference=$out/bin/$wrapped $out/bin/ccls |