mirror of
https://github.com/sxyazi/yazi.git
synced 2026-07-21 23:01:05 +00:00
fix(nix): rust overlay infinite recursion (#2216)
This commit is contained in:
parent
ebaf2c29c1
commit
e37d8d6bc1
1 changed files with 14 additions and 16 deletions
30
flake.nix
30
flake.nix
|
|
@ -21,21 +21,12 @@
|
|||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
rust-overlay.overlays.default
|
||||
(
|
||||
final: prev:
|
||||
let
|
||||
toolchain = final.rust-bin.stable.latest.default;
|
||||
in
|
||||
{
|
||||
rustPlatform = prev.makeRustPlatform {
|
||||
cargo = toolchain;
|
||||
rustc = toolchain;
|
||||
};
|
||||
}
|
||||
)
|
||||
];
|
||||
overlays = [ rust-overlay.overlays.default ];
|
||||
};
|
||||
toolchain = pkgs.rust-bin.stable.latest.default;
|
||||
rustPlatform = pkgs.makeRustPlatform {
|
||||
cargo = toolchain;
|
||||
rustc = toolchain;
|
||||
};
|
||||
|
||||
rev = self.shortRev or self.dirtyShortRev or "dirty";
|
||||
|
|
@ -46,7 +37,14 @@
|
|||
in
|
||||
{
|
||||
packages = {
|
||||
yazi-unwrapped = pkgs.callPackage ./nix/yazi-unwrapped.nix { inherit version rev date; };
|
||||
yazi-unwrapped = pkgs.callPackage ./nix/yazi-unwrapped.nix {
|
||||
inherit
|
||||
version
|
||||
rev
|
||||
date
|
||||
rustPlatform
|
||||
;
|
||||
};
|
||||
yazi = pkgs.callPackage ./nix/yazi.nix { inherit (self.packages.${system}) yazi-unwrapped; };
|
||||
default = self.packages.${system}.yazi;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue