From 770b95f452ca010cb449f8ec35b621a7adf55513 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 26 Nov 2024 12:25:02 +1300 Subject: [PATCH] Try Android SDK version 26 --- overlays/android.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/overlays/android.nix b/overlays/android.nix index 488ebada37..0e264f881e 100644 --- a/overlays/android.nix +++ b/overlays/android.nix @@ -1,4 +1,18 @@ -_final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isAndroid ({ +_final: prev: { + pkgsCross = prev.pkgsCross // { + aarch64-android = import prev.path { + inherit system; + inherit (prev) overlays; + crossSystem = prev.lib.systems.examples.aarch64-android // { sdkVer = "26"; }; + }; + armv7a-android-prebuilt = import prev.path { + inherit system; + inherit (prev) overlays; + crossSystem = prev.lib.systems.examples.armv7a-android-prebuilt // { sdkVer = "26"; }; + }; + }; +} // prev.lib.optionalAttrs prev.stdenv.hostPlatform.isAndroid ({ + # we really only want the static one. libiconv = (prev.libiconv.override { enableStatic = true; enableShared = false; }).overrideAttrs(_: { hardeningDisable = [ "fortify" "stackprotector" "format" ];