modules/wrapper/build/config.nix

@@ -9,35 +9,30 @@
   inherit (pkgs) vimPlugins;
   inherit (lib.strings) isString;
   inherit (lib.lists) filter map;
-  inherit (builtins) path;
 
   # alias to the internal configuration
   vimOptions = config.vim;
 
-  noBuildPlug = pname: let
+  noBuildPlug = {pname, ...} @ attrs: let
-    input = inputs."plugin-${pname}";
+    src = inputs."plugin-${attrs.pname}";
-    version = input.shortRev or input.shortDirtyRev or "dirty";
+  in
-  in {
+    {
-    # vim.lazy.plugins relies on pname, so we only set that here
+      version = src.shortRev or src.shortDirtyRev or "dirty";
-    # version isn't needed for anything, but inherit it anyway for correctness
+      outPath = src;
-    inherit pname version;
+      passthru.vimPlugin = false;
-    outPath = path {
+    }
-      name = "${pname}-0-unstable-${version}";
+    // attrs;
-      path = input.outPath;
-    };
-    passthru.vimPlugin = false;
-  };
 
   # build a vim plugin with the given name and arguments
   # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug
   # instead
   buildPlug = attrs: let
-    input = inputs."plugin-${attrs.pname}";
+    src = inputs."plugin-${attrs.pname}";
   in
     pkgs.vimUtils.buildVimPlugin (
       {
-        version = input.shortRev or input.shortDirtyRev or "dirty";
+        version = src.shortRev or src.shortDirtyRev or "dirty";
-        src = input.outPath;
+        inherit src;
       }
       // attrs
     );
@@ -56,7 +51,7 @@
     map (
       plug:
         if (isString plug)
-        then pluginBuilders.${plug} or (noBuildPlug plug)
+        then pluginBuilders.${plug} or (noBuildPlug {pname = plug;})
         else plug
     ) (filter (f: f != null) plugins);