From 28dd08a0dff382af91dedce487647e9a2d37c651 Mon Sep 17 00:00:00 2001 From: Mio Date: Fri, 13 Feb 2026 01:03:38 +1100 Subject: [PATCH] android-translation-layer: 0-unstable-2026-01-08 -> 0-unstable-2026-01-19 --- .../configure-dex-install-dir.patch | 8 ++++---- .../configure-microg-path.patch | 16 ---------------- .../an/android-translation-layer/package.nix | 18 ++++-------------- 3 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/an/android-translation-layer/configure-microg-path.patch diff --git a/pkgs/by-name/an/android-translation-layer/configure-dex-install-dir.patch b/pkgs/by-name/an/android-translation-layer/configure-dex-install-dir.patch index 14c886acc81d..94d3cab07f6a 100644 --- a/pkgs/by-name/an/android-translation-layer/configure-dex-install-dir.patch +++ b/pkgs/by-name/an/android-translation-layer/configure-dex-install-dir.patch @@ -1,10 +1,10 @@ diff --git a/src/main-executable/main.c b/src/main-executable/main.c -index d7cfbfe8..c542c71a 100644 +index 558bd994..2d341b4b 100644 --- a/src/main-executable/main.c +++ b/src/main-executable/main.c -@@ -311,6 +311,7 @@ static void open(GtkApplication *app, GFile **files, gint nfiles, const gchar *h - } else { - dex_install_dir = "DIDN'T_GET_SO_PATH_WITH_dladdr_SUS"; // in case we print this as part of some other error, it should be clear what the real cause is +@@ -351,6 +351,7 @@ static void open(GtkApplication *app, GFile **files, gint nfiles, const gchar *h + fprintf(stderr, "error: couldn't find art install path\n"); + exit(1); } + dex_install_dir = "@out@/lib/java/dex"; diff --git a/pkgs/by-name/an/android-translation-layer/configure-microg-path.patch b/pkgs/by-name/an/android-translation-layer/configure-microg-path.patch deleted file mode 100644 index 21e8c3d29016..000000000000 --- a/pkgs/by-name/an/android-translation-layer/configure-microg-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/main-executable/main.c b/src/main-executable/main.c -index 545da00f..2f87447d 100644 ---- a/src/main-executable/main.c -+++ b/src/main-executable/main.c -@@ -390,7 +390,10 @@ static void open(GtkApplication *app, GFile **files, gint nfiles, const gchar *h - - ret = stat(MICROG_APK_PATH_LOCAL, &dont_care); - errno_localdir = errno; -- if (!ret) { -+ char *env_microg = getenv("MICROG_APK_PATH"); -+ if (env_microg && access(env_microg, F_OK) == 0) { -+ microg_apk = strdup(env_microg); -+ } else if (stat(MICROG_APK_PATH_LOCAL, &dont_care) == 0) { - microg_apk = strdup(MICROG_APK_PATH_LOCAL); // for running out of builddir; using strdup so we can always safely call free on this - } else { - char *microg_install_dir = malloc(strlen(dex_install_dir) + strlen(REL_MICROG_APK_INSTALL_PATH) + 1); // +1 for NULL diff --git a/pkgs/by-name/an/android-translation-layer/package.nix b/pkgs/by-name/an/android-translation-layer/package.nix index c40a55978d1f..3f35e2d9e911 100644 --- a/pkgs/by-name/an/android-translation-layer/package.nix +++ b/pkgs/by-name/an/android-translation-layer/package.nix @@ -5,7 +5,6 @@ meson, openjdk17, lib, - glib, pkg-config, wayland-protocols, wayland, @@ -23,20 +22,19 @@ bionic-translation, alsa-lib, makeWrapper, - replaceVars, nixosTests, bintools, }: stdenv.mkDerivation { pname = "android-translation-layer"; - version = "0-unstable-2026-01-08"; + version = "0-unstable-2026-01-19"; src = fetchFromGitLab { owner = "android_translation_layer"; repo = "android_translation_layer"; - rev = "b4d749b9b7f1a8620b976f03a2924d0661f7232f"; - hash = "sha256-SeMxbqyD3MXDR4fHans7pdQSa/SLoWOl9QhnpH7CWCY="; + rev = "bfcfb696d83c9769e1d99d3cb0d7a5908fe3c767"; + hash = "sha256-BTVduEJhKEOFhqoG0lgqlcg2x4k9RWABURj2nQECaek="; }; patches = [ @@ -45,9 +43,6 @@ stdenv.mkDerivation { # Patch custon Dex install dir ./configure-dex-install-dir.patch - - # Patch atl to load microg apk from custom path - ./configure-microg-path.patch ]; postPatch = '' @@ -82,10 +77,6 @@ stdenv.mkDerivation { webkitgtk_6_0 ]; - postInstall = '' - install -D $src/com.google.android.gms.apk $out/share/com.google.android.gms.apk - ''; - postFixup = '' wrapProgram $out/bin/android-translation-layer \ --prefix LD_LIBRARY_PATH : ${art-standalone}/lib/art \ @@ -94,8 +85,7 @@ stdenv.mkDerivation { art-standalone # dex2oat bintools # addr2line ] - } \ - --set MICROG_APK_PATH "$out/share/com.google.android.gms.apk" + } ''; passthru.tests = {