NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-22 21:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use luajit from the neovim package's lua attribute

Browse source
This commit is contained in:
diniamo 2024-08-10 09:05:06 +02:00
parent d48f52f065
commit 78c01d50ed
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/default.nix
View file

@ -29,6 +29,8 @@ inputs: {
# alias to the internal configuration # alias to the internal configuration
vimOptions = module.config.vim; vimOptions = module.config.vim;
luajit = vimOptions.package.lua;
# build a vim plugin with the given name and arguments # build a vim plugin with the given name and arguments
# if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
# instead # instead
@ -41,6 +43,8 @@ inputs: {
inherit src; inherit src;
nativeBuildInputs = with pkgs.vimUtils; [ nativeBuildInputs = with pkgs.vimUtils; [
luajit
vimCommandCheckHook vimCommandCheckHook
vimGenDocHook vimGenDocHook
neovimRequireCheckHook neovimRequireCheckHook
@ -102,12 +106,12 @@ inputs: {
luaConfig = luaConfig =
if vimOptions.byteCompileLua if vimOptions.byteCompileLua
then pkgs.runCommandLocal "init.lua" {text = vimOptions.builtLuaConfigRC;} "${pkgs.luajit}/bin/luajit -bd -- - $out <<< \"$text\"" then pkgs.runCommandLocal "init.lua" {text = vimOptions.builtLuaConfigRC;} "${luajit}/bin/luajit -bd -- - $out <<< \"$text\""
else pkgs.writeText "init.lua" vimOptions.builtLuaConfigRC; else pkgs.writeText "init.lua" vimOptions.builtLuaConfigRC;
extraLuaFiles = extraLuaFiles =
if vimOptions.byteCompileLua if vimOptions.byteCompileLua
then map (file: pkgs.runCommandLocal (baseNameOf file) {} "${pkgs.luajit}/bin/luajit -bd -- ${file} $out") vimOptions.extraLuaFiles then map (file: pkgs.runCommandLocal (baseNameOf file) {} "${luajit}/bin/luajit -bd -- ${file} $out") vimOptions.extraLuaFiles
else vimOptions.extraLuaFiles; else vimOptions.extraLuaFiles;
# Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to # Wrap the user's desired (unwrapped) Neovim package with arguments that'll be used to