From 1d689dffdbdcd3333b7636324a8f2dcdd6961cbf Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Date: Wed, 27 Nov 2024 17:54:33 +1300
Subject: [PATCH] Fix android sdk/ndk pins so they work for ci.nix

---
 overlays/android.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/overlays/android.nix b/overlays/android.nix
index 50a3751ae..7a7c86954 100644
--- a/overlays/android.nix
+++ b/overlays/android.nix
@@ -1,18 +1,16 @@
-_final: prev: {
+final: prev: {
   # Use android SDK version 26
-  pkgsCross = prev.pkgsCross // {
-    aarch64-android = import prev.path {
-      inherit (prev) system overlays;
-      crossSystem = prev.lib.systems.examples.aarch64-android // {
-        androidSdkVersion = "26";
-        androidNdkVersion = "24";
-      };
-    };
-    armv7a-android-prebuilt = import prev.path {
-      inherit (prev) system overlays;
-      crossSystem = prev.lib.systems.examples.armv7a-android-prebuilt // {
-        androidSdkVersion = "26";
-        androidNdkVersion = "24";
+  lib = prev.lib // {
+    systems = prev.lib.systems // {
+      examples = prev.lib.systems.examples // {
+        aarch64-android = prev.lib.systems.examples.aarch64-android // {
+          androidSdkVersion = "26";
+          androidNdkVersion = "24";
+        };
+        armv7a-android-prebuilt = prev.lib.systems.examples.armv7a-android-prebuilt // {
+          androidSdkVersion = "26";
+          androidNdkVersion = "24";
+        };
       };
     };
   };