From abf6beabea80aace26d21d101e451cce5c2c2374 Mon Sep 17 00:00:00 2001
From: osbm <osmanfbayram@gmail.com>
Date: Sun, 11 May 2025 01:46:12 +0300
Subject: [PATCH] progress

---
 apks/by-name/li/lichess/package.nix | 44 ++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/apks/by-name/li/lichess/package.nix b/apks/by-name/li/lichess/package.nix
index 5d5f543..637fd2b 100644
--- a/apks/by-name/li/lichess/package.nix
+++ b/apks/by-name/li/lichess/package.nix
@@ -3,7 +3,42 @@
   stdenv,
   pkgs
 }:
+let
+  buildToolsVersion = "34.0.0";
+  androidComposition = pkgs.androidenv.composeAndroidPackages {
+    buildToolsVersions = [ buildToolsVersion "30.0.3" ];
+    platformVersions = [ "29" "30" "31" "32" "33" "34" "35" "28" ];
+    abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+  #   toolsVersion = "26.1.1";
+  #   platformToolsVersion = "33.0.3";
+  #   # buildToolsVersions = [ buildToolsVersionForAapt2 ];
+    includeEmulator = true;
+    emulatorVersion = "34.1.19";
+  #   platformVersions = [ "28" "29" "30" "31" ];
+  #   includeSources = false;
+  #   includeSystemImages = false;
+  #   systemImageTypes = [ "google_apis_playstore" ];
+  #   abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+  #   cmakeVersions = [ "3.10.2" ];
+    includeNDK = true;
+    ndkVersions = [ "22.0.7026061" ];
+  #   useGoogleAPIs = false;
+    useGoogleTVAddOns = false;
 
+    extraLicenses = [
+      "android-googletv-license"
+      "android-sdk-arm-dbt-license"
+      "android-sdk-license"
+      "android-sdk-preview-license"
+      "google-gdk-license"
+      "intel-android-extra-license"
+      "intel-android-sysimage-license"
+      "mips-android-sysimage-license"
+   ];
+  };
+  androidSdk = androidComposition.androidsdk;
+  # pubspecLock = pkgs.lib.importJSON ./pubspec.lock.json;
+in
 stdenv.mkDerivation rec {
   name = "lichess";
   version = "0.14.14";
@@ -20,10 +55,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = ''
-    export ANDROID_HOME=${pkgs.androidsdk}/libexec
-    export ANDROID_NDK_HOME=${pkgs.androidndk}/libexec
-    export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH
-
+    # export ANDROID_HOME=${pkgs.androidsdk}/libexec
+    export ANDROID_SDK_ROOT=${androidSdk}/libexec/android-sdk
+    # export ANDROID_NDK_HOME=${pkgs.androidndk}/libexec
+    # export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH
+    export GRADLE_OPTS="-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/34.0.0/aapt2"
     yarn install
     yarn android:build