mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 06:45:54 +03:00
neovim: fix nodejs and ruby generation
These were not translated correctly in the new wrapper.
This commit is contained in:
parent
43b99f23b3
commit
42cc40ddc8
@ -24,7 +24,7 @@ let
|
||||
withPython2 ? false
|
||||
/* the function you would have passed to python.withPackages */
|
||||
, extraPython2Packages ? (_: [ ])
|
||||
, withPython3 ? true
|
||||
, withPython3 ? true
|
||||
/* the function you would have passed to python3.withPackages */
|
||||
, extraPython3Packages ? (_: [ ])
|
||||
, withNodeJs ? false
|
||||
@ -45,7 +45,6 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
requiredPlugins = vimUtils.requiredPlugins configure;
|
||||
getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
|
||||
|
||||
@ -104,9 +103,11 @@ let
|
||||
wrapperArgs = makeWrapperArgs;
|
||||
inherit neovimRcContent;
|
||||
inherit manifestRc;
|
||||
inherit rubyEnv;
|
||||
inherit python2Env;
|
||||
inherit python3Env;
|
||||
inherit withNodeJs;
|
||||
} // lib.optionalAttrs withRuby {
|
||||
inherit rubyEnv;
|
||||
};
|
||||
|
||||
genProviderSettings = prog: withProg:
|
||||
|
@ -18,8 +18,8 @@ let
|
||||
, manifestRc ? null
|
||||
, withPython2 ? true, python2Env ? null
|
||||
, withPython3 ? true, python3Env ? null
|
||||
, withNodeJs? false
|
||||
, withRuby ? true, rubyEnv ? null
|
||||
, withNodeJs ? false
|
||||
, rubyEnv ? null
|
||||
, vimAlias ? false
|
||||
, viAlias ? false
|
||||
, ...
|
||||
@ -52,7 +52,7 @@ let
|
||||
+ optionalString withPython3 ''
|
||||
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
|
||||
''
|
||||
+ optionalString withNodeJs ''
|
||||
|
Loading…
Reference in New Issue
Block a user