diff options
| author | Brandon Kase <brandon.kase@gmail.com> | 2016-07-09 17:26:19 -0700 |
|---|---|---|
| committer | Daiderd Jordan <daiderd.jordan@hgst.com> | 2016-07-18 19:01:58 +0200 |
| commit | 0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0 (patch) | |
| tree | 06b5cca4f1213120cedc0ab691cce0ee6c620c90 /pkgs/misc/vim-plugins/patches | |
| parent | 6f893694401fa3048eed94c865ed3f0038deac44 (diff) | |
| download | nixpkgs-0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0.tar nixpkgs-0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0.tar.gz nixpkgs-0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0.tar.bz2 nixpkgs-0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0.tar.lz nixpkgs-0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0.tar.xz nixpkgs-0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0.tar.zst nixpkgs-0ca5879b5a9c28bfe4c2bce1559b94995ee6b5f0.zip | |
vimPlugins: fix youcompleteme on darwin
Diffstat (limited to 'pkgs/misc/vim-plugins/patches')
| -rw-r--r-- | pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch | 14 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch | 36 |
2 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch b/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch new file mode 100644 index 00000000000..fddf91b1c57 --- /dev/null +++ b/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch @@ -0,0 +1,14 @@ + +--- ./third_party/ycmd/cpp/CMakeLists.txt ++++ ./third_party/ycmd/cpp/CMakeLists.txt +@@ -121,8 +121,8 @@ + set( CPP11_AVAILABLE true ) + endif() + elseif( COMPILER_IS_CLANG ) +- set( CPP11_AVAILABLE true ) +- set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" ) ++ #set( CPP11_AVAILABLE true ) ++ # set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" ) + set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++" ) + endif() + diff --git a/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch b/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch new file mode 100644 index 00000000000..a1c4b1b39a4 --- /dev/null +++ b/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch @@ -0,0 +1,36 @@ +--- ./third_party/ycmd/cpp/ycm/CMakeLists.txt ++++ ./third_party/ycmd/cpp/ycm/CMakeLists.txt +@@ -335,7 +335,7 @@ + COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>" + ) + +- if( APPLE ) ++ #if( APPLE ) + # In OS X El Capitan, Apple introduced System Integrity Protection. + # Amongst other things, this introduces features to the dynamic loader + # (dyld) which cause it to "sanitise" (and complain about) embedded +@@ -354,15 +354,15 @@ + # simply strip the rpath entry from the dylib. There's no way any + # @executable_path that python might have could be in any way useful to + # libclang.dylib, so this seems perfectly safe. +- get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) +- add_custom_command( TARGET ${PROJECT_NAME} +- POST_BUILD +- COMMAND install_name_tool +- "-delete_rpath" +- "@executable_path/../lib" +- "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}" +- ) +- endif() ++ # get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) ++ #add_custom_command( TARGET ${PROJECT_NAME} ++ # POST_BUILD ++ # COMMAND install_name_tool ++ # "-delete_rpath" ++ # "@executable_path/../lib" ++ # "$<TARGET_FILE_DIR:${PROJECT_NAME}>/${LIBCLANG_TAIL}" ++ # ) ++ # endif() + endif() + endif() + |