Skip to content

Commit

Permalink
flake: Follow package Nix version in dev shell
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaofengli committed Sep 11, 2024
1 parent 96ccfd2 commit 5dec29f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions crane.nix
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ let
maintainers = with maintainers; [ zhaofengli ];
platforms = platforms.linux ++ platforms.darwin;
};

passthru = {
inherit nix;
};
} // args // extraArgs);

attic = mkAttic {
Expand Down
2 changes: 1 addition & 1 deletion flake/devshells.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ in
NIX_PATH = "nixpkgs=${pkgs.path}";

# See comment in `attic/build.rs`
NIX_INCLUDE_PATH = "${lib.getDev pkgs.nixVersions.nix_2_24}/include";
NIX_INCLUDE_PATH = "${lib.getDev self'.packages.attic.passthru.nix}/include";

# Used by `just with-nix` to build/test with alternative Nix versions.
NIX_VERSIONS = config.attic.nix-versions.manifestFile;
Expand Down

0 comments on commit 5dec29f

Please sign in to comment.