nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 12:53:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

neovim: fix withRuby regression (#352045)

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

Fix https://github.com/NixOS/nixpkgs/issues/351839.
This commit is contained in:
Zhong Jianxin 2024-10-29 19:52:36 +08:00 committed by GitHub
parent 0c9fe1106e
commit 09e2e58692
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ let
, withNodeJs ? false
, withPerl ? false
, rubyEnv ? null
, withRuby ? true
# wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim
, vimAlias ? false
@ -127,8 +127,7 @@ let
;
providerLuaRc = neovimUtils.generateProviderRc {
inherit (finalAttrs) withPython3 withNodeJs withPerl;
withRuby = rubyEnv != null;
inherit (finalAttrs) withPython3 withNodeJs withPerl withRuby;
};
# If configure != {}, we can't generate the rplugin.vim file with e.g
@ -155,10 +154,9 @@ let
__structuredAttrs = true;
dontUnpack = true;
inherit viAlias vimAlias withNodeJs withPython3 withPerl;
inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby;
inherit wrapRc providerLuaRc packpathDirs;
inherit python3Env rubyEnv;
withRuby = rubyEnv != null;
inherit wrapperArgs generatedWrapperArgs;
luaRcContent = rcContent;
# Remove the symlinks created by symlinkJoin which we need to perform
@ -171,7 +169,7 @@ let
+ lib.optionalString finalAttrs.withPython3 ''
makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH
''
+ lib.optionalString (finalAttrs.rubyEnv != null) ''
+ lib.optionalString (finalAttrs.withRuby) ''
ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
''
+ lib.optionalString finalAttrs.withNodeJs ''