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

Merge pull request #31771 from cstrahan/ycmd-update

Browse Source 
ycmd update
This commit is contained in:
Daiderd Jordan 2017-11-17 19:20:18 +01:00 committed by GitHub
commit e677ed1c5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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-03-27"; version = "2017-11-05";
src = fetchgit { src = fetchgit {
url = "git://github.com/Valloric/ycmd.git"; url = "git://github.com/Valloric/ycmd.git";
rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2"; rev = "0ca16e7ba3a9078b697befdce64104e61829aa3b";
sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj"; sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi";
}; };
buildInputs = [ cmake boost ] buildInputs = [ cmake boost ]

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

@ -1,16 +1,33 @@
diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt 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 --- a/cpp/ycm/CMakeLists.txt
+++ b/cpp/ycm/CMakeLists.txt +++ b/cpp/ycm/CMakeLists.txt
@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG ) @@ -359,28 +359,6 @@ if( LIBCLANG_TARGET )
# our libraries require, in particular the Python one (from pyenv for POST_BUILD
# instance). COMMAND ${CMAKE_COMMAND} -E copy "${PATH_TO_LLVM_ROOT}/bin/libclang.dll" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) )
- # When loading our library, the dynamic linker will look for - else()
- # libclang.so.4, not libclang.so.4.x. - add_custom_command(
- file( RENAME - TARGET ${PROJECT_NAME}
- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION} - POST_BUILD
- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} ) - COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
endif() - )
-
- 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()
endif()

2
pkgs/top-level/all-packages.nix
View File

@ -7736,7 +7736,7 @@ with pkgs;
ycmd = callPackage ../development/tools/misc/ycmd { ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
llvmPackages = llvmPackages_4; llvmPackages = llvmPackages_5;
python = python2; python = python2;
}; };