neovim: fix withRuby regression (#352045)

The wrapper refactor https://github.com/NixOS/nixpkgs/pull/344541
effectively make withRuby always enabled.

Fix https://github.com/NixOS/nixpkgs/issues/351839.

authored by Zhong Jianxin and committed by GitHub 09e2e586 0c9fe110

+4 -6
+4 -6
pkgs/applications/editors/neovim/wrapper.nix
··· 29 29 30 30 , withNodeJs ? false 31 31 , withPerl ? false 32 - , rubyEnv ? null 32 + , withRuby ? true 33 33 34 34 # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim 35 35 , vimAlias ? false ··· 127 127 ; 128 128 129 129 providerLuaRc = neovimUtils.generateProviderRc { 130 - inherit (finalAttrs) withPython3 withNodeJs withPerl; 131 - withRuby = rubyEnv != null; 130 + inherit (finalAttrs) withPython3 withNodeJs withPerl withRuby; 132 131 }; 133 132 134 133 # If configure != {}, we can't generate the rplugin.vim file with e.g ··· 155 154 156 155 __structuredAttrs = true; 157 156 dontUnpack = true; 158 - inherit viAlias vimAlias withNodeJs withPython3 withPerl; 157 + inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby; 159 158 inherit wrapRc providerLuaRc packpathDirs; 160 159 inherit python3Env rubyEnv; 161 - withRuby = rubyEnv != null; 162 160 inherit wrapperArgs generatedWrapperArgs; 163 161 luaRcContent = rcContent; 164 162 # Remove the symlinks created by symlinkJoin which we need to perform ··· 171 169 + lib.optionalString finalAttrs.withPython3 '' 172 170 makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH 173 171 '' 174 - + lib.optionalString (finalAttrs.rubyEnv != null) '' 172 + + lib.optionalString (finalAttrs.withRuby) '' 175 173 ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby 176 174 '' 177 175 + lib.optionalString finalAttrs.withNodeJs ''