Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] proper rustc in devShell #3967

Merged
merged 1 commit into from
Oct 12, 2023
Merged

[fix] proper rustc in devShell #3967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
};
});
}