WIP: SDK 29

nix-community · Feb 21, 2024 · 35a86ec · 35a86ec
1 parent a13bcde
commit 35a86ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix
@@ -82,7 +82,7 @@ in
     environment.files = {
       inherit login loginInner;
 
-      prootStatic = "/nix/store/6rybxjd5hdpphhx635qp1avsv030h836-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-05-13";
+      prootStatic = "/nix/store/ycl75zc640cry3y686012bypfylbl1i4-proot-termux-aarch64-unknown-linux-android-unstable-2023-05-13";
     };
 
   };

diff --git a/pkgs/cross-compiling/cross-pkgs-args.nix b/pkgs/cross-compiling/cross-pkgs-args.nix
@@ -27,11 +27,19 @@ in
   inherit system;
 
   crossSystem = {
+    # that one is cool because it could make its way on-device one day,
+    # but it is currently broken
+    #   sdkVer = "30";
+    #   libc = "bionic";
+    #   useAndroidPrebuilt = false;
+    #   useLLVM = true;
+    #   isStatic = true;
+
+    # use that one instead
     config = "${config.build.arch}-unknown-linux-android";
-    sdkVer = "32";
+    sdkVer = "29";
     ndkVer = "24";
-    libc = "bionic";
+    #ndkVer = "21";
     useAndroidPrebuilt = true;
-    isStatic = true;
   };
 }