android-translation-layer: 0-unstable-2026-01-08 -> 0-unstable-2026-0… (#489799)
This commit is contained in:
@@ -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";
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -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 = {
|
||||
|
||||
Reference in New Issue
Block a user