youcompleteme (vim plugin): update to latest
patchShebangs fixes build failure in chroot (in this new version). The --system-libclang flag is now needed to prevent YouCompleteMe from trying to download and build clang (which fails).
This commit is contained in:
parent
5d294db3b2
commit
abaf2dbeae
@ -111,26 +111,27 @@ in rec
|
|||||||
YouCompleteMe = stdenv.mkDerivation {
|
YouCompleteMe = stdenv.mkDerivation {
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/Valloric/YouCompleteMe.git";
|
url = "https://github.com/Valloric/YouCompleteMe.git";
|
||||||
rev = "67288080ea7057ea3111cb4c863484e3b150e738";
|
rev = "a2cae90f7ba1746bf1209edd6739f87d5914b375";
|
||||||
sha256 = "1a3rwdl458z1yrp50jdwp629j4al0zld21n15sad28g51m8gw5ka";
|
sha256 = "1yxrxskxnr2da5awm59ra4s9wg67rimcbazvln9bayg9saxs540d";
|
||||||
};
|
};
|
||||||
|
|
||||||
name = "youcompleteme-git-6728808";
|
name = "youcompleteme-git-a2cae90";
|
||||||
buildInputs = [ python cmake clang.clang ];
|
buildInputs = [ python cmake clang.clang ];
|
||||||
|
|
||||||
configurePhase = ":";
|
configurePhase = ":";
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
patchShebangs .
|
||||||
|
|
||||||
target=$out/share/vim-plugins/YouCompleteMe
|
target=$out/share/vim-plugins/YouCompleteMe
|
||||||
mkdir -p $target
|
mkdir -p $target
|
||||||
cp -a ./ $target
|
cp -a ./ $target
|
||||||
|
|
||||||
|
|
||||||
mkdir $target/build
|
mkdir $target/build
|
||||||
cd $target/build
|
cd $target/build
|
||||||
cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
|
cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
|
||||||
make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
|
make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
|
||||||
${bash}/bin/bash $target/install.sh --clang-completer
|
${bash}/bin/bash $target/install.sh --clang-completer --system-libclang
|
||||||
|
|
||||||
${vimHelpTags}
|
${vimHelpTags}
|
||||||
vimHelpTags $target
|
vimHelpTags $target
|
||||||
|
Loading…
x
Reference in New Issue
Block a user