@@ -121,18 +121,18 @@
121121 rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
122122 craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
123123 craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
124− commonArgs =
125− {
126− inherit stdenv;
127− src = filteredSource;
128− # disable fetching and building of tree-sitter grammars in the helix-term build.rs
129− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
130− buildInputs = [stdenv.cc.cc.lib];
131− # disable tests
132− doCheck = false;
133− meta.mainProgram = "hx";
134− }
135− // craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
124+ commonArgs = {
125+ inherit stdenv;
126+ inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
127+ inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
128+ src = filteredSource;
129+ # disable fetching and building of tree-sitter grammars in the helix-term build.rs
130+ HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
131+ buildInputs = [stdenv.cc.cc.lib];
132+ # disable tests
133+ doCheck = false;
134+ meta.mainProgram = "hx";
135+ };
136136 cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
137137 in {
138138 packages = {