From 42cc40ddc8109e682a31ad1971c2f0450c5dd839 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Mon, 2 Nov 2020 21:59:00 +0100
Subject: [PATCH] neovim: fix nodejs and ruby generation

These were not translated correctly in the new wrapper.
---
 pkgs/applications/editors/neovim/utils.nix   | 7 ++++---
 pkgs/applications/editors/neovim/wrapper.nix | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index d3af8ca5d59a..906a726924f9 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -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:
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index d18d13a050fe..71bc38eadcfb 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -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 ''