mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix the git hash missing and add some more comments. (#13024)

Browse source
This commit is contained in:
Christopher Smyth 2025-03-04 14:12:48 -05:00 • committed by GitHub
parent fbc0f956b3
commit b1ee4ab5c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -5,6 +5,7 @@
runCommand, runCommand,
installShellFiles, installShellFiles,
git, git,
gitRev ? null,
... ...
}: let }: let
fs = lib.fileset; fs = lib.fileset;
@ -34,9 +35,6 @@
ln -s ${grammars} $out/grammars ln -s ${grammars} $out/grammars
''; '';
in in
# Currently rustPlatform.buildRustPackage doesn't have the finalAttrs pattern
# hooked up. To get around this while having good customization, mkDerivation is
# used instead.
rustPlatform.buildRustPackage (self: { rustPlatform.buildRustPackage (self: {
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
@ -63,7 +61,7 @@ in
HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
# So Helix knows what rev it is. # So Helix knows what rev it is.
HELIX_NIX_BUILD_REV = self.rev or self.dirtyRev or null; HELIX_NIX_BUILD_REV = gitRev;
doCheck = false; doCheck = false;
strictDeps = true; strictDeps = true;

25
flake.nix
View file

@ -16,7 +16,9 @@
flake-utils, flake-utils,
rust-overlay, rust-overlay,
... ...
}: }: let
gitRev = self.rev or self.dirtyRev or null;
in
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -31,13 +33,20 @@
}; };
in { in {
packages = rec { packages = rec {
helix = pkgs.callPackage ./default.nix {}; helix = pkgs.callPackage ./default.nix {inherit gitRev;};
# The default Helix build. Uses the latest stable Rust toolchain, and unstable /**
# nixpkgs. The default Helix build. Uses the latest stable Rust toolchain, and unstable
# nixpkgs.
# This can be overridden though to add Cargo Features, flags, and different toolchains with
# packages.${system}.default.override { ... }; The build inputs can be overriden with the following:
packages.${system}.default.override { rustPlatform = newPlatform; };
Overriding a derivation attribute can be done as well:
packages.${system}.default.overrideAttrs { buildType = "debug"; };
*/
default = helix; default = helix;
}; };
@ -71,7 +80,7 @@
}) })
// { // {
overlays.default = final: prev: { overlays.default = final: prev: {
helix = final.callPackage ./default.nix {}; helix = final.callPackage ./default.nix {inherit gitRev;};
}; };
}; };