From 1a2c7fe628b8539c55b2a9248a09f609c0479667 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Thu, 18 Aug 2016 01:35:30 +0300 Subject: [PATCH] ycmd: fix build This also fixes build for Mac OS X. The build failed before because both clang and clang-unwrapped were in scope and CMake tried to compile the library with unwrapped clang with well-understood consequences. This commit fixes the issue by passing libclang through a different way. --- pkgs/development/tools/misc/ycmd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 5a56933d3ca..b511b7d1948 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -10,12 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr"; }; - buildInputs = [ python cmake llvmPackages.clang boost makeWrapper ]; + buildInputs = [ python cmake boost makeWrapper ]; propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ]; buildPhase = '' - python build.py --clang-completer --system-libclang --system-boost + export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} + python build.py --clang-completer --system-boost ''; configurePhase = ":";