mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-11-12 16:35:30 +00:00
blink-cmp: apply Nix patch; use new fetcher
This commit is contained in:
parent
dc2a38f273
commit
fc520fa1ab
1 changed files with 18 additions and 4 deletions
|
|
@ -5,6 +5,7 @@
|
||||||
git,
|
git,
|
||||||
src,
|
src,
|
||||||
version,
|
version,
|
||||||
|
fetchpatch,
|
||||||
}: let
|
}: let
|
||||||
blink-fuzzy-lib = rustPlatform.buildRustPackage {
|
blink-fuzzy-lib = rustPlatform.buildRustPackage {
|
||||||
pname = "blink-fuzzy-lib";
|
pname = "blink-fuzzy-lib";
|
||||||
|
|
@ -13,11 +14,10 @@
|
||||||
# TODO: remove this if plugin stops using nightly rust
|
# TODO: remove this if plugin stops using nightly rust
|
||||||
env.RUSTC_BOOTSTRAP = true;
|
env.RUSTC_BOOTSTRAP = true;
|
||||||
|
|
||||||
|
useFetchCargoVendor = true;
|
||||||
|
cargoHash = "sha256-F1wh/TjYoiIbDY3J/prVF367MKk3vwM7LqOpRobOs7I=";
|
||||||
|
|
||||||
nativeBuildInputs = [git];
|
nativeBuildInputs = [git];
|
||||||
cargoLock = {
|
|
||||||
lockFile = "${src}/Cargo.lock";
|
|
||||||
allowBuiltinFetchGit = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
libExt =
|
libExt =
|
||||||
|
|
@ -34,5 +34,19 @@ in
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
mkdir -p target/release
|
mkdir -p target/release
|
||||||
ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
|
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"];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue