fix(nix): shell env

This commit is contained in:
XYenon 2025-11-24 18:34:57 +08:00
parent b686b55bb8
commit e6d11b5d2a
3 changed files with 19 additions and 14 deletions

View file

@ -52,10 +52,13 @@
}; };
devShells = { devShells = {
default = pkgs.callPackage ./nix/shell.nix { }; default = pkgs.callPackage ./nix/shell.nix {
inherit toolchain;
inherit (self.packages.${system}) yazi yazi-unwrapped;
};
}; };
formatter = pkgs.nixfmt-rfc-style; formatter = pkgs.nixfmt-tree;
} }
) )
// { // {

View file

@ -1,14 +1,14 @@
{ {
callPackage, mkShell,
rust-bin, yazi,
toolchain,
nodePackages, nodePackages,
yazi-unwrapped,
}: }:
let
mainPkg = callPackage ./yazi.nix { }; mkShell {
in packages = yazi.passthru.runtimePaths ++ [
mainPkg.overrideAttrs (oa: { (toolchain.override {
nativeBuildInputs = [
(rust-bin.nightly.latest.default.override {
extensions = [ extensions = [
"rust-src" "rust-src"
"rustfmt" "rustfmt"
@ -16,10 +16,10 @@ mainPkg.overrideAttrs (oa: {
"clippy" "clippy"
]; ];
}) })
nodePackages.cspell nodePackages.cspell
] ];
++ (oa.nativeBuildInputs or [ ]);
inputsFrom = [ yazi-unwrapped ];
env.RUST_BACKTRACE = "1"; env.RUST_BACKTRACE = "1";
}) }

View file

@ -96,6 +96,8 @@ runCommand yazi-unwrapped.name
inherit (yazi-unwrapped) pname version meta; inherit (yazi-unwrapped) pname version meta;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
passthru.runtimePaths = runtimePaths;
} }
'' ''
mkdir -p $out/bin mkdir -p $out/bin