Merge pull request #19 from huuff/18-use-rust-analyzer-from-the-rust-…

…overlay fix: rust-analyzer from rust-overlay
huuff · Nov 11, 2024 · 902c8d9 · 902c8d9
2 parents fe1b2a1 + 2738043
commit 902c8d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/leptos/flake.nix b/leptos/flake.nix
@@ -41,6 +41,10 @@
         overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs { inherit system overlays; };
         rustPkgs = pkgs.rust-bin.stable.latest.default.override {
+          extensions = [
+            "rust-src"
+            "rust-analyzer"
+          ];
           targets = [
             "x86_64-unknown-linux-musl"
             "wasm32-unknown-unknown"
@@ -79,7 +83,6 @@
               nixfmt-rfc-style
 
               rustPkgs
-              rust-analyzer
 
               cargo-leptos
               cargo-expand # expand macros

diff --git a/rust/flake.nix b/rust/flake.nix
@@ -39,6 +39,10 @@
         overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs { inherit system overlays; };
         rustPkgs = pkgs.rust-bin.stable.latest.default.override {
+          extensions = [
+            "rust-src"
+            "rust-analyzer"
+          ];
           targets = [ "x86_64-unknown-linux-musl" ];
         };
         treefmt-build = (treefmt.lib.evalModule pkgs ./treefmt.nix).config.build;
@@ -70,7 +74,6 @@
             buildInputs = pre-commit-check.enabledPackages ++ [
               # rust
               rustPkgs
-              rust-analyzer
               cargo-expand # see macro expansions
 
               # nix