Merge 460232765d into 8febf44422

flake/packages.nix

@@ -6,7 +6,7 @@
     ...
   }: let
     docs = import ../docs {inherit pkgs inputs lib;};
-    pluginVersion = input: input.shortRev or input.shortDirtyRev or "dirty";
+    pluginVersion = src: src.shortRev or src.shortDirtyRev or "dirty";
   in {
     packages = {
       inherit (docs.manual) htmlOpenTool;
@@ -68,7 +68,7 @@
           };
         };
 
-      # Plugins that need a compile step
+      # Plugins that need compiling
       blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix {
         src = inputs.plugin-blink-cmp;
         version = pluginVersion inputs.plugin-blink-cmp;

flake/packages/blink-cmp.nix

@@ -1,38 +1,35 @@
 {
   rustPlatform,
   hostPlatform,
+  vimUtils,
   src,
   version,
-  vimUtils,
+}: let
-}: {
+  blink-fuzzy-lib = rustPlatform.buildRustPackage {
-  blink-cmp = let
+    pname = "blink-fuzzy-lib";
     inherit version src;
-    blink-fuzzy-lib = rustPlatform.buildRustPackage {
-      pname = "blink-fuzzy-lib";
-      inherit version src;
 
-      env = {
+    env = {
-        # TODO: remove this if plugin stops using nightly rust
+      # TODO: remove this if plugin stops using nightly rust
-        RUSTC_BOOTSTRAP = true;
+      RUSTC_BOOTSTRAP = true;
-      };
+    };
-      cargoLock = {
+    cargoLock = {
-        lockFile = "${src}/Cargo.lock";
+      lockFile = "${src}/Cargo.lock";
-        outputHashes = {
+      outputHashes = {
-          "frizbee-0.1.0" = "sha256-pt6sMsRyjXrbrTK7t/YvWeen/n3nU8UUaiNYTY1LczE=";
+        "frizbee-0.1.0" = "sha256-pt6sMsRyjXrbrTK7t/YvWeen/n3nU8UUaiNYTY1LczE=";
-        };
       };
     };
-    libExt =
+  };
-      if hostPlatform.isDarwin
+  libExt =
-      then "dylib"
+    if hostPlatform.isDarwin
-      else "so";
+    then "dylib"
-  in
+    else "so";
-    vimUtils.buildVimPlugin {
+in
-      pname = "blink-cmp";
+  vimUtils.buildVimPlugin {
-      inherit version src;
+    pname = "blink-cmp";
-      preInstall = ''
+    inherit version src;
-        mkdir -p target/release
+    preInstall = ''
-        ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
+      mkdir -p target/release
-      '';
+      ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
-    };
+    '';
-}
+  }

modules/wrapper/build/config.nix

@@ -45,6 +45,11 @@
       pname = "flutter-tools";
       patches = [../patches/flutter-tools.patch];
     };
+    blink-cmp = pkgs.callPackage ../../../flake/packages/blink-cmp.nix {
+      src = inputs.plugin-blink-cmp;
+      # TODO: extract into helper func
+      version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
+    };
   };
 
   buildConfigPlugins = plugins: