From f371dcaa4e7e8769c66164006247016cf274dd67 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Mon, 7 Oct 2024 10:25:08 -0400 Subject: [PATCH] flake: Include --cfg tokio_unstable in Rust flags The flake sets `RUSTFLAGS` and that overwrites the setting in `.cargo/config.toml`. We need to add the `--cfg tokio_unstable` flag to enable integration tests to run when called from the devShell. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c7e4fdce5..aabb6c70c 100644 --- a/flake.nix +++ b/flake.nix @@ -114,7 +114,7 @@ if pkgs.stdenv.isLinux then pkgs.stdenv else pkgs.clangStdenv; - rustFlagsEnv = pkgs.lib.optionalString stdenv.isLinux "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"; + rustFlagsEnv = pkgs.lib.optionalString stdenv.isLinux "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment --cfg tokio_unstable"; rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain; craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;