nix: working solution for android-arm64 arch

Signed-off-by: markoburcul <marko@status.im>
This commit is contained in:
markoburcul
2025-02-07 11:47:57 +01:00
parent d6675afd81
commit 4479810968
2 changed files with 6 additions and 6 deletions

View File

@@ -35,8 +35,8 @@
packages = forAllSystems (system: let
pkgs = pkgsFor.${system};
in rec {
zerokit-android-arm64 = pkgs.callPackage ./nix/default.nix { target-platform="aarch64-android"; rust-target= "aarch64-linux-android"; };
zerokit-android-arm = pkgs.callPackage ./nix/default.nix { target-platform="x86_64-linux-android"; rust-target= "x86_64-linux-android"; };
zerokit-android-arm64 = pkgs.callPackage ./nix/default.nix { target-platform="aarch64-android-prebuilt"; rust-target= "aarch64-linux-android"; };
#zerokit-android-arm = pkgs.callPackage ./nix/default.nix { target-platform="armv7a-android-prebuilt"; rust-target= "armv7-linux-androideabi"; };
default = zerokit-android-arm64;
});
};

View File

@@ -1,6 +1,6 @@
{
pkgs,
target-platform ? "aarch64-android",
target-platform ? "aarch64-android-prebuilt",
rust-target ? "aarch64-linux-android",
}:
@@ -15,7 +15,7 @@ pkgs.pkgsCross.${target-platform}.rustPlatform.buildRustPackage {
allowBuiltinFetchGit = true;
};
ANDROID_NDK_HOME="${pkgs.androidPkgs.ndk}";
#ANDROID_NDK_HOME="${pkgs.androidPkgs.ndk}";
CARGO_HOME = "/tmp";
buildPhase = ''
@@ -25,8 +25,8 @@ pkgs.pkgsCross.${target-platform}.rustPlatform.buildRustPackage {
'';
installPhase = ''
mkdir -p $out/build/
cp -r ./target/release/librln.so $out/build/
mkdir -p $out/
cp ./target/${rust-target}/release/librln.so $out/
'';
meta = with pkgs.lib; {