neovim: fix nodejs and ruby generation
These were not translated correctly in the new wrapper.
This commit is contained in:
parent
43b99f23b3
commit
42cc40ddc8
|
@ -45,7 +45,6 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
requiredPlugins = vimUtils.requiredPlugins configure;
|
requiredPlugins = vimUtils.requiredPlugins configure;
|
||||||
getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
|
getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
|
||||||
|
|
||||||
|
@ -104,9 +103,11 @@ let
|
||||||
wrapperArgs = makeWrapperArgs;
|
wrapperArgs = makeWrapperArgs;
|
||||||
inherit neovimRcContent;
|
inherit neovimRcContent;
|
||||||
inherit manifestRc;
|
inherit manifestRc;
|
||||||
inherit rubyEnv;
|
|
||||||
inherit python2Env;
|
inherit python2Env;
|
||||||
inherit python3Env;
|
inherit python3Env;
|
||||||
|
inherit withNodeJs;
|
||||||
|
} // lib.optionalAttrs withRuby {
|
||||||
|
inherit rubyEnv;
|
||||||
};
|
};
|
||||||
|
|
||||||
genProviderSettings = prog: withProg:
|
genProviderSettings = prog: withProg:
|
||||||
|
|
|
@ -19,7 +19,7 @@ let
|
||||||
, withPython2 ? true, python2Env ? null
|
, withPython2 ? true, python2Env ? null
|
||||||
, withPython3 ? true, python3Env ? null
|
, withPython3 ? true, python3Env ? null
|
||||||
, withNodeJs ? false
|
, withNodeJs ? false
|
||||||
, withRuby ? true, rubyEnv ? null
|
, rubyEnv ? null
|
||||||
, vimAlias ? false
|
, vimAlias ? false
|
||||||
, viAlias ? false
|
, viAlias ? false
|
||||||
, ...
|
, ...
|
||||||
|
@ -52,7 +52,7 @@ let
|
||||||
+ optionalString withPython3 ''
|
+ optionalString withPython3 ''
|
||||||
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
|
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
|
||||||
''
|
''
|
||||||
+ optionalString withRuby ''
|
+ optionalString (rubyEnv != null) ''
|
||||||
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
|
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
|
||||||
''
|
''
|
||||||
+ optionalString withNodeJs ''
|
+ optionalString withNodeJs ''
|
||||||
|
|
Loading…
Reference in a new issue