From 2c2aff02a449ebf43bc10dc6d9d797abfe2e7c87 Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 4 Mar 2024 19:02:31 +0000 Subject: [PATCH] nix: read Rust version from scripts/rust-toolchain --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ba890db98..9d24f45dc 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,8 @@ platforms-android-34 ndk-23-2-8568313 ]); + rust-version = pkgs.lib.removeSuffix "\n" + (builtins.readFile ./scripts/rust-toolchain); in { devShells.default = pkgs.mkShell { ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk"; @@ -33,7 +35,7 @@ buildInputs = [ android-sdk pkgs.openjdk17 - (pkgs.buildPackages.rust-bin.stable."1.72.0".minimal.override { + (pkgs.buildPackages.rust-bin.stable."${rust-version}".minimal.override { targets = [ "armv7-linux-androideabi" "aarch64-linux-android"