diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-21 23:19:59 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-21 23:19:59 +0300 |
| commit | 1bb80801eb8c504575c45a2f44f41d3548b76c5a (patch) | |
| tree | 7018021bdc86a261af1c3e8120e035156e9ff04a /pkgs/misc/vim-plugins | |
| parent | d47fbff0e9d299d12f51d029f911f2a42fe2b6a7 (diff) | |
| parent | 6386d68e9df785a503d4efe78f069f3c64dfdbd0 (diff) | |
| download | nixlib-1bb80801eb8c504575c45a2f44f41d3548b76c5a.tar nixlib-1bb80801eb8c504575c45a2f44f41d3548b76c5a.tar.gz nixlib-1bb80801eb8c504575c45a2f44f41d3548b76c5a.tar.bz2 nixlib-1bb80801eb8c504575c45a2f44f41d3548b76c5a.tar.lz nixlib-1bb80801eb8c504575c45a2f44f41d3548b76c5a.tar.xz nixlib-1bb80801eb8c504575c45a2f44f41d3548b76c5a.tar.zst nixlib-1bb80801eb8c504575c45a2f44f41d3548b76c5a.zip | |
Merge pull request #14044 from kamilchm/youcompleteme
vimPlugins: youcompleteme FIX #14006 No rule to make target 'ycm_support_libs'
Diffstat (limited to 'pkgs/misc/vim-plugins')
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b2ce4d39b808..fa09d1ca92b9 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -883,11 +883,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-03-08"; + name = "youcompleteme-2016-03-10"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "381b2132719a959f41e57ec0e6396fc1c3b6daf4"; - sha256 = "1gski3s1960pmxisyq85awda0a3kb22ji9y76f67k1a4smy5q9xa"; + rev = "f44435b88ec98156d17869aa67ad15f38cfecbf3"; + sha256 = "1y50ilyfwj6rvpvg50iq418maxvsfs54i202v7x0lfs5hmvcb4hi"; }; dependencies = []; buildInputs = [ @@ -904,7 +904,7 @@ rec { mkdir build pushd build cmake -G "Unix Makefiles" . ../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_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer --system-libclang popd ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index 48f5322267b8..cb90adfdc397 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -12,7 +12,7 @@ mkdir build pushd build cmake -G "Unix Makefiles" . ../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_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer --system-libclang popd ''; |