Merge pull request #25352 from LnL7/darwin-ycmd
ycmd: copy libclang on darwin
This commit is contained in:
commit
0bae6d0afc
@ -2,7 +2,7 @@
|
|||||||
, gocode ? null
|
, gocode ? null
|
||||||
, godef ? null
|
, godef ? null
|
||||||
, rustracerd ? null
|
, rustracerd ? null
|
||||||
, Cocoa ? null
|
, fixDarwinDylibNames, Cocoa ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj";
|
sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
|
buildInputs = [ cmake boost ]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
|
export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
|
||||||
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||||||
" ycmd/__main__.py
|
" ycmd/__main__.py
|
||||||
|
|
||||||
mkdir -p $out/lib/ycmd
|
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
|
mkdir -p $out/bin
|
||||||
ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
|
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";
|
description = "A code-completion and comprehension server";
|
||||||
homepage = https://github.com/Valloric/ycmd;
|
homepage = https://github.com/Valloric/ycmd;
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ rasendubi cstrahan ];
|
maintainers = with maintainers; [ rasendubi cstrahan lnl7 ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user