Merge pull request #64219 from jonringer/ycmd-python3

ycmd: build with python3
This commit is contained in:
Charles Strahan 2019-07-08 03:54:52 -04:00 committed by GitHub
commit 5ded60dfc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -416,19 +416,19 @@ self: super: {
youcompleteme = super.youcompleteme.overrideAttrs(old: {
buildPhase = ''
substituteInPlace plugin/youcompleteme.vim \
--replace "'ycm_path_to_python_interpreter', '''" \
"'ycm_path_to_python_interpreter', '${python}/bin/python'"
--replace "'ycm_python_interpreter_path', '''" \
"'ycm_python_interpreter_path', '${python3}/bin/python'"
rm -r third_party/ycmd
ln -s ${ycmd}/lib/ycmd third_party
'';
meta = {
meta = with stdenv.lib; {
description = "A code-completion engine for Vim";
homepage = https://github.com/Valloric/YouCompleteMe;
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
platforms = stdenv.lib.platforms.unix;
homepage = "https://github.com/Valloric/YouCompleteMe";
license = licenses.gpl3;
maintainers = with maintainers; [ marcweber jagajaga ];
platforms = platforms.unix;
};
});

View File

@ -9859,7 +9859,7 @@ in
ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa;
python = python2;
python = python3;
};
yodl = callPackage ../development/tools/misc/yodl { };