diff options
author | Tanguy | 2023-12-08 18:04:09 +0000 |
---|---|---|
committer | GitHub | 2023-12-08 18:04:09 +0000 |
commit | 510928618dfcddcd6d3086b278332fa93ee32998 (patch) | |
tree | c94171c3d6c4997c52acd73b47022950db3b3fee /flake.nix | |
parent | b81aacc5e1332bb01043a18e55dd9e9543711ec6 (diff) |
Fix version of Nix package (#9013)
Diffstat (limited to 'flake.nix')
-rw-r--r-- | flake.nix | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -121,18 +121,18 @@ rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain; craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default; - commonArgs = - { - inherit stdenv; - src = filteredSource; - # disable fetching and building of tree-sitter grammars in the helix-term build.rs - HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; - buildInputs = [stdenv.cc.cc.lib]; - # disable tests - doCheck = false; - meta.mainProgram = "hx"; - } - // craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}; + commonArgs = { + inherit stdenv; + inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname; + inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version; + src = filteredSource; + # disable fetching and building of tree-sitter grammars in the helix-term build.rs + HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; + buildInputs = [stdenv.cc.cc.lib]; + # disable tests + doCheck = false; + meta.mainProgram = "hx"; + }; cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs; in { packages = { |