Merge d48f52f065 into fd65c83956

modules/default.nix

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