public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ycmd: 2017-11-05 -> 2018-06-14 (#42080)

Browse Source 
Fixes build with boost 1.67
This commit is contained in:
Daiderd Jordan 2018-06-18 00:09:29 +02:00 committed by xeji
parent 3babb8d84b
commit a2a83755a2
2 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/misc/ycmd/default.nix
View File

@ -7,12 +7,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ycmd-${version}"; name = "ycmd-${version}";
version = "2017-11-05"; version = "2018-06-14";
src = fetchgit { src = fetchgit {
url = "git://github.com/Valloric/ycmd.git"; url = "https://github.com/Valloric/ycmd.git";
rev = "0ca16e7ba3a9078b697befdce64104e61829aa3b"; rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41";
sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi"; sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
${python.interpreter} build.py --system-libclang --clang-completer --system-boost ${python.interpreter} build.py --system-libclang --clang-completer --system-boost
''; '';
patches = [ ./dont-symlink-clang.patch ];
configurePhase = ":"; configurePhase = ":";
# remove the tests # remove the tests
@ -53,8 +51,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release} mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
cp -r third_party/JediHTTP $out/lib/ycmd/third_party for p in jedi waitress frozendict bottle python-future requests; do
for p in waitress frozendict bottle python-future argparse requests; do
cp -r third_party/$p $out/lib/ycmd/third_party cp -r third_party/$p $out/lib/ycmd/third_party
done done

33
pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
View File

@ -1,33 +0,0 @@
diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
index 133c987a..33625271 100644
--- a/cpp/ycm/CMakeLists.txt
+++ b/cpp/ycm/CMakeLists.txt
@@ -359,28 +359,6 @@ if( LIBCLANG_TARGET )
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${PATH_TO_LLVM_ROOT}/bin/libclang.dll" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
)
- else()
- add_custom_command(
- TARGET ${PROJECT_NAME}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
- )
-
- if( NOT APPLE )
- # When loading our library, the dynamic linker may look for
- # libclang.so.x instead of libclang.so.x.y. Create the corresponding
- # symlink.
- get_filename_component( LIBCLANG_NAME ${LIBCLANG_TARGET} NAME )
- string( REGEX REPLACE "([^.]+).([0-9]+).([0-9]+)$" "\\1.\\2"
- LIBCLANG_SONAME ${LIBCLANG_NAME} )
- add_custom_command(
- TARGET ${PROJECT_NAME}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E create_symlink
- "${LIBCLANG_NAME}"
- "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_SONAME}"
- )
- endif()
endif()
endif()