diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-05-07 22:58:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-07 22:58:02 +0200 |
commit | 0bae6d0afc2a62a2daf7da7fb16b8a18832c0dd0 (patch) | |
tree | b74cd360b7a5afd29549a057b842811bbe938ea7 /pkgs | |
parent | 2f3cfe696bc9f997587531c343a373a7e463f9ed (diff) | |
parent | 3b7566e76f924442fe8c691b113423552fceff7b (diff) |
Merge pull request #25352 from LnL7/darwin-ycmd
ycmd: copy libclang on darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/ycmd/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index eb02d0e79dde6..cc805b499d438 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -2,7 +2,7 @@ , gocode ? null , godef ? null , rustracerd ? null -, Cocoa ? null +, fixDarwinDylibNames, Cocoa ? null }: stdenv.mkDerivation rec { @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj"; }; - buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ cmake boost ] + ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ]; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { " ycmd/__main__.py mkdir -p $out/lib/ycmd - cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/ + cp -r ycmd/ CORE_VERSION libclang.so.* libclang.dylib* ycm_core.so $out/lib/ycmd/ mkdir -p $out/bin ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { description = "A code-completion and comprehension server"; homepage = https://github.com/Valloric/ycmd; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi cstrahan ]; + maintainers = with maintainers; [ rasendubi cstrahan lnl7 ]; platforms = platforms.all; }; } |