about summary refs log tree commit diff
path: root/pkgs/development/tools/misc/ycmd
diff options
context:
space:
mode:
authorAlexey Shmalko <rasen.dubi@gmail.com>2016-08-18 01:35:30 +0300
committerAlexey Shmalko <rasen.dubi@gmail.com>2016-08-18 03:26:51 +0300
commit1a2c7fe628b8539c55b2a9248a09f609c0479667 (patch)
tree61c44ef2ce6615fd92b5775f6cc42bca44afa232 /pkgs/development/tools/misc/ycmd
parent1db8403e6f8845299ee796f7f8de85130f9fa2d8 (diff)
downloadnixlib-1a2c7fe628b8539c55b2a9248a09f609c0479667.tar
nixlib-1a2c7fe628b8539c55b2a9248a09f609c0479667.tar.gz
nixlib-1a2c7fe628b8539c55b2a9248a09f609c0479667.tar.bz2
nixlib-1a2c7fe628b8539c55b2a9248a09f609c0479667.tar.lz
nixlib-1a2c7fe628b8539c55b2a9248a09f609c0479667.tar.xz
nixlib-1a2c7fe628b8539c55b2a9248a09f609c0479667.tar.zst
nixlib-1a2c7fe628b8539c55b2a9248a09f609c0479667.zip
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.
Diffstat (limited to 'pkgs/development/tools/misc/ycmd')
-rw-r--r--pkgs/development/tools/misc/ycmd/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 5a56933d3ca5..b511b7d1948b 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 = ":";