yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

nix: read Rust version from scripts/rust-toolchain

Browse source
This commit is contained in:
link2xt 2024-03-04 19:02:31 +00:00
parent c50feaf82b
commit 2c2aff02a4
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -22,6 +22,8 @@
platforms-android-34 platforms-android-34
ndk-23-2-8568313 ndk-23-2-8568313
]); ]);
rust-version = pkgs.lib.removeSuffix "\n"
(builtins.readFile ./scripts/rust-toolchain);
in { in {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk"; ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
@ -33,7 +35,7 @@
buildInputs = [ buildInputs = [
android-sdk android-sdk
pkgs.openjdk17 pkgs.openjdk17
(pkgs.buildPackages.rust-bin.stable."1.72.0".minimal.override { (pkgs.buildPackages.rust-bin.stable."${rust-version}".minimal.override {
targets = [ targets = [
"armv7-linux-androideabi" "armv7-linux-androideabi"
"aarch64-linux-android" "aarch64-linux-android"