From fc520fa1ab23ac456dee39e97262dd0459dccccb Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 16 Mar 2025 20:40:22 +0300 Subject: [PATCH] blink-cmp: apply Nix patch; use new fetcher --- flake/legacyPackages/blink-cmp.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix index 924cb4cc..ba1d7424 100644 --- a/flake/legacyPackages/blink-cmp.nix +++ b/flake/legacyPackages/blink-cmp.nix @@ -5,6 +5,7 @@ git, src, version, + fetchpatch, }: let blink-fuzzy-lib = rustPlatform.buildRustPackage { pname = "blink-fuzzy-lib"; @@ -13,11 +14,10 @@ # TODO: remove this if plugin stops using nightly rust env.RUSTC_BOOTSTRAP = true; + useFetchCargoVendor = true; + cargoHash = "sha256-F1wh/TjYoiIbDY3J/prVF367MKk3vwM7LqOpRobOs7I="; + nativeBuildInputs = [git]; - cargoLock = { - lockFile = "${src}/Cargo.lock"; - allowBuiltinFetchGit = true; - }; }; libExt = @@ -34,5 +34,19 @@ in preInstall = '' mkdir -p target/release ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt} + echo -n "nix" > target/release/version ''; + + # Borrowed from nixpkgs + # TODO: Remove this patch when updating to next version + patches = [ + (fetchpatch { + name = "blink-add-bypass-for-nix.patch"; + url = "https://github.com/Saghen/blink.cmp/commit/6c83ef1ae34abd7ef9a32bfcd9595ac77b61037c.diff?full_index=1"; + hash = "sha256-304F1gDDKVI1nXRvvQ0T1xBN+kHr3jdmwMMp8CNl+GU="; + }) + ]; + + # Module for reproducing issues + nvimSkipModule = ["repro"]; }