diff options
| author | Charles Strahan <charles@cstrahan.com> | 2017-11-17 11:17:18 -0500 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2017-11-17 11:20:11 -0500 |
| commit | f39c132bce20b49bef98dbdd79a10e714b4419be (patch) | |
| tree | a6785e6f39cd7f4a65e6947f9b231ba3426ea814 /pkgs/development/tools/misc/ycmd | |
| parent | cfafd6f5a819472911eaf2650b50a62f0c143e3e (diff) | |
| download | nixlib-f39c132bce20b49bef98dbdd79a10e714b4419be.tar nixlib-f39c132bce20b49bef98dbdd79a10e714b4419be.tar.gz nixlib-f39c132bce20b49bef98dbdd79a10e714b4419be.tar.bz2 nixlib-f39c132bce20b49bef98dbdd79a10e714b4419be.tar.lz nixlib-f39c132bce20b49bef98dbdd79a10e714b4419be.tar.xz nixlib-f39c132bce20b49bef98dbdd79a10e714b4419be.tar.zst nixlib-f39c132bce20b49bef98dbdd79a10e714b4419be.zip | |
ycmd: 2017-03-27 -> 2017-11-05
Diffstat (limited to 'pkgs/development/tools/misc/ycmd')
| -rw-r--r-- | pkgs/development/tools/misc/ycmd/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch | 39 |
2 files changed, 31 insertions, 14 deletions
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index cc805b499d43..4c60067c48ef 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "ycmd-${version}"; - version = "2017-03-27"; + version = "2017-11-05"; src = fetchgit { url = "git://github.com/Valloric/ycmd.git"; - rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2"; - sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj"; + rev = "0ca16e7ba3a9078b697befdce64104e61829aa3b"; + sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi"; }; buildInputs = [ cmake boost ] diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch index 6af691426bb7..6199758de520 100644 --- a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch +++ b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch @@ -1,16 +1,33 @@ diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt -index 00e4882..8f29797 100644 +index 133c987a..33625271 100644 --- a/cpp/ycm/CMakeLists.txt +++ b/cpp/ycm/CMakeLists.txt -@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG ) - # our libraries require, in particular the Python one (from pyenv for - # instance). - set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) -- # When loading our library, the dynamic linker will look for -- # libclang.so.4, not libclang.so.4.x. -- file( RENAME -- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION} -- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} ) - endif() +@@ -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() |