mirror of
https://github.com/helix-editor/helix
synced 2024-11-10 10:34:45 +01:00
Fix version of Nix package (#9013)
This commit is contained in:
parent
b81aacc5e1
commit
510928618d
24
flake.nix
24
flake.nix
@ -121,18 +121,18 @@
|
|||||||
rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||||
craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
|
craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
|
||||||
craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
|
craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
|
||||||
commonArgs =
|
commonArgs = {
|
||||||
{
|
inherit stdenv;
|
||||||
inherit stdenv;
|
inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
|
||||||
src = filteredSource;
|
inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
|
||||||
# disable fetching and building of tree-sitter grammars in the helix-term build.rs
|
src = filteredSource;
|
||||||
HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
|
# disable fetching and building of tree-sitter grammars in the helix-term build.rs
|
||||||
buildInputs = [stdenv.cc.cc.lib];
|
HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
|
||||||
# disable tests
|
buildInputs = [stdenv.cc.cc.lib];
|
||||||
doCheck = false;
|
# disable tests
|
||||||
meta.mainProgram = "hx";
|
doCheck = false;
|
||||||
}
|
meta.mainProgram = "hx";
|
||||||
// craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
|
};
|
||||||
cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
|
cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
|
||||||
in {
|
in {
|
||||||
packages = {
|
packages = {
|
||||||
|
Loading…
Reference in New Issue
Block a user