blink: move package into legacyPackage

NotAShelf · Feb 6, 2025 · 8a069a6 · 8a069a6
1 parent 9dccd4b
commit 8a069a6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
@@ -9,10 +9,14 @@
       overlays = [
         inputs.self.overlays.default
 
-        (_: _: {
+        (final: _: {
           # Build nil from source to get most recent
           # features as they are added.
           nil = inputs'.nil.packages.default;
+          blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix {
+            src = inputs.plugin-blink-cmp;
+            version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
+          };
         })
       ];
     };

diff --git a/modules/wrapper/build/packages/blink-cmp.nix → flake/legacyPackages/blink-cmp.nix b/modules/wrapper/build/packages/blink-cmp.nix → flake/legacyPackages/blink-cmp.nix
@@ -10,6 +10,10 @@
     pname = "blink-fuzzy-lib";
     inherit version src;
 
+    env = {
+      # TODO: remove this if plugin stops using nightly rust
+      RUSTC_BOOTSTRAP = true;
+    };
     nativeBuildInputs = [git];
     cargoLock = {
       lockFile = "${src}/Cargo.lock";

diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
@@ -61,10 +61,7 @@
         "flutter-tools.dev_tools"
       ];
     };
-    blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix {
-      src = inputs.plugin-blink-cmp;
-      version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
-    };
+    inherit (pkgs) blink-cmp;
   };
 
   buildConfigPlugins = plugins: