fix(nix): shell env (#3363)

Author: XYenon

flake.lock

@@ -52,10 +52,13 @@
         };
 
         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;
       }
     )
     // {

flake.nix

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

nix/shell.nix

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