public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

neovim: fix nodejs and ruby generation

Browse Source 
These were not translated correctly in the new wrapper.
This commit is contained in:
Matthieu Coudron 2020-11-02 21:59:00 +01:00 committed by Matthieu Coudron
parent 43b99f23b3
commit 42cc40ddc8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/neovim/utils.nix
View File

@ -24,7 +24,7 @@ let
withPython2 ? false withPython2 ? false
/* the function you would have passed to python.withPackages */ /* the function you would have passed to python.withPackages */
, extraPython2Packages ? (_: [ ]) , extraPython2Packages ? (_: [ ])
, withPython3 ? true , withPython3 ? true
/* the function you would have passed to python3.withPackages */ /* the function you would have passed to python3.withPackages */
, extraPython3Packages ? (_: [ ]) , extraPython3Packages ? (_: [ ])
, withNodeJs ? false , withNodeJs ? false
@ -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:

6
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -18,8 +18,8 @@ let
, manifestRc ? null , manifestRc ? null
, 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 ''