From 3a4058ec75f9946213abfb89447f5dd8d840cfe6 Mon Sep 17 00:00:00 2001 From: vector1dev <vector1dev@riseup.net> Date: Sun, 7 Jan 2024 21:27:22 +0300 Subject: [PATCH] ignore only rustup in nix shell --- flake.nix | 2 ++ mk/depends.mk | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index c8689ab79..cf6a0de7b 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,8 @@ qemu_kvm (rust-bin.fromRustupToolchainFile ./rust-toolchain.toml) + rust-cbindgen + just ]; }; }); diff --git a/mk/depends.mk b/mk/depends.mk index 0e1dcb42c..e0d88e58a 100644 --- a/mk/depends.mk +++ b/mk/depends.mk @@ -1,15 +1,18 @@ # Dependencies -# Don't check for Rust/Cargo if you will be using Nix -ifneq ($(NIX_SHELL_BUILD),1) - # Don't check for Rust/Cargo if you will be using Podman ifneq ($(PODMAN_BUILD),1) + +# Don't check for Rust/Cargo if you will be using Nix +ifneq ($(NIX_SHELL_BUILD),1) + ifeq ($(shell which rustup),) $(error rustup not found, install from "https://rustup.rs/") endif +endif + ifeq ($(shell which cbindgen),) $(error cbindgen not found, install from crates.io or from your package manager) endif @@ -28,5 +31,4 @@ ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^just v$(JUST $(error just $(JUST_VERSION) not found, run "cargo install --force --version $(JUST_VERSION) just") endif -endif endif \ No newline at end of file -- GitLab