[fix] #0000: proper rustc in devShell

Signed-off-by: Artemii Gerasimovich <[email protected]>
hyperledger-iroha · Oct 11, 2023 · 957bf48 · 957bf48
1 parent bb45bb3
commit 957bf48
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/flake.nix b/flake.nix
@@ -161,8 +161,11 @@
       inherit mkIroha;
 
       packages.default = mkIroha {};
-
-      packages.appimage = nix-appimage.mkappimage.${system} { drv = mkIroha {}; name="iroha"; };
+
+      packages.appimage = nix-appimage.mkappimage.${system} {
+        drv = mkIroha {};
+        name = "iroha";
+      };
 
       packages.targets = builtins.listToAttrs (map (target: {
           name = target;
@@ -193,16 +196,27 @@
 
       formatter = alejandra.packages.${system}.default;
 
-      devShells.default = pkgs.mkShell {
-        nativeBuildInputs = with pkgs; [
-          pkg-config
-          openssl.dev
-          libiconvReal
-          zlib
-          (fenix'.toolchainOf toolchainSpec).completeToolchain
+      devShells.default = let
+        toolchainPkgs = fenix'.toolchainOf toolchainSpec;
+        toolchain = fenix'.combine [
+          toolchainPkgs.rustc
+          toolchainPkgs.cargo
+          toolchainPkgs.clippy
+          toolchainPkgs.rustfmt
+          toolchainPkgs.rust-std
         ];
+      in
+        pkgs.mkShell {
+          nativeBuildInputs = with pkgs; [
+            pkg-config
+            openssl.dev
+            libiconvReal
+            zlib
+            toolchain
+            fenix'.rust-analyzer
+          ];
 
-        IROHA_SKIP_WASM_CHECKS = true;
-      };
+          IROHA_SKIP_WASM_CHECKS = true;
+        };
     });
 }