Merge pull request #64219 from jonringer/ycmd-python3
ycmd: build with python3
This commit is contained in:
commit
5ded60dfc4
@ -416,19 +416,19 @@ self: super: {
|
|||||||
youcompleteme = super.youcompleteme.overrideAttrs(old: {
|
youcompleteme = super.youcompleteme.overrideAttrs(old: {
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
substituteInPlace plugin/youcompleteme.vim \
|
substituteInPlace plugin/youcompleteme.vim \
|
||||||
--replace "'ycm_path_to_python_interpreter', '''" \
|
--replace "'ycm_python_interpreter_path', '''" \
|
||||||
"'ycm_path_to_python_interpreter', '${python}/bin/python'"
|
"'ycm_python_interpreter_path', '${python3}/bin/python'"
|
||||||
|
|
||||||
rm -r third_party/ycmd
|
rm -r third_party/ycmd
|
||||||
ln -s ${ycmd}/lib/ycmd third_party
|
ln -s ${ycmd}/lib/ycmd third_party
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "A code-completion engine for Vim";
|
description = "A code-completion engine for Vim";
|
||||||
homepage = https://github.com/Valloric/YouCompleteMe;
|
homepage = "https://github.com/Valloric/YouCompleteMe";
|
||||||
license = stdenv.lib.licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
|
maintainers = with maintainers; [ marcweber jagajaga ];
|
||||||
platforms = stdenv.lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -9859,7 +9859,7 @@ in
|
|||||||
|
|
||||||
ycmd = callPackage ../development/tools/misc/ycmd {
|
ycmd = callPackage ../development/tools/misc/ycmd {
|
||||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||||
python = python2;
|
python = python3;
|
||||||
};
|
};
|
||||||
|
|
||||||
yodl = callPackage ../development/tools/misc/yodl { };
|
yodl = callPackage ../development/tools/misc/yodl { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user