android-translation-layer: 0-unstable-2025-08-06 -> 0-unstable-2025-09-14

+35 -30
+2 -26
pkgs/by-name/an/android-translation-layer/configure-art-path.patch
··· 1 diff --git a/meson.build b/meson.build 2 - index 8f525118..ba8027c2 100644 3 --- a/meson.build 4 +++ b/meson.build 5 - @@ -9,22 +9,15 @@ add_project_dependencies(incdir_dep, language: 'c') 6 - cc = meson.get_compiler('c') 7 - dir_base = meson.current_source_dir() 8 - builddir_base = meson.current_build_dir() 9 - -# FIXME: make art install a pkgconfig file 10 - -libart_dep = [ 11 - - cc.find_library('art', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]), 12 - - cc.find_library('nativebridge', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]) 13 - -] 14 - +libart_dep = dependency('art-standalone') 15 - libdl_bio_dep = [ 16 - cc.find_library('dl_bio') 17 - ] 18 libc_bio_dep = [ 19 cc.find_library('c_bio') 20 ] 21 - -libandroidfw_dep = [ 22 - - cc.find_library('androidfw', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]), 23 - -] 24 -if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar') 25 - bootclasspath_dir = '/usr' / get_option('libdir') / 'java' 26 +if fs.is_file('@artStandalonePackageDir@' / get_option('libdir') / 'java/core-all_classes.jar') ··· 28 elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar') 29 bootclasspath_dir = '/usr/local' / get_option('libdir') / 'java' 30 elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar') 31 - @@ -179,7 +172,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [ 32 - dependency('gtk4', version: '>=4.14'), dependency('gl'), dependency('egl'), dependency('wayland-client'), dependency('jni'), 33 - dependency('libportal'), dependency('sqlite3'), dependency('libavcodec', version: '>=59'), dependency('libdrm'), 34 - dependency('gudev-1.0'), dependency('libswscale'), dependency('webkitgtk-6.0'), 35 - - libandroidfw_dep, wayland_protos_dep 36 - + libart_dep, wayland_protos_dep 37 - ], 38 - link_with: [ libandroid_so ], 39 - link_args: [
··· 1 diff --git a/meson.build b/meson.build 2 + index ad776069..ba8027c2 100644 3 --- a/meson.build 4 +++ b/meson.build 5 + @@ -16,8 +16,8 @@ libdl_bio_dep = [ 6 libc_bio_dep = [ 7 cc.find_library('c_bio') 8 ] 9 -if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar') 10 - bootclasspath_dir = '/usr' / get_option('libdir') / 'java' 11 +if fs.is_file('@artStandalonePackageDir@' / get_option('libdir') / 'java/core-all_classes.jar') ··· 13 elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar') 14 bootclasspath_dir = '/usr/local' / get_option('libdir') / 'java' 15 elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar')
+16
pkgs/by-name/an/android-translation-layer/configure-microg-path.patch
···
··· 1 + diff --git a/src/main-executable/main.c b/src/main-executable/main.c 2 + index 545da00f..2f87447d 100644 3 + --- a/src/main-executable/main.c 4 + +++ b/src/main-executable/main.c 5 + @@ -390,7 +390,10 @@ static void open(GtkApplication *app, GFile **files, gint nfiles, const gchar *h 6 + 7 + ret = stat(MICROG_APK_PATH_LOCAL, &dont_care); 8 + errno_localdir = errno; 9 + - if (!ret) { 10 + + char *env_microg = getenv("MICROG_APK_PATH"); 11 + + if (env_microg && access(env_microg, F_OK) == 0) { 12 + + microg_apk = strdup(env_microg); 13 + + } else if (stat(MICROG_APK_PATH_LOCAL, &dont_care) == 0) { 14 + microg_apk = strdup(MICROG_APK_PATH_LOCAL); // for running out of builddir; using strdup so we can always safely call free on this 15 + } else { 16 + char *microg_install_dir = malloc(strlen(dex_install_dir) + strlen(REL_MICROG_APK_INSTALL_PATH) + 1); // +1 for NULL
+17 -4
pkgs/by-name/an/android-translation-layer/package.nix
··· 30 31 stdenv.mkDerivation { 32 pname = "android-translation-layer"; 33 - version = "0-unstable-2025-08-06"; 34 35 src = fetchFromGitLab { 36 owner = "android_translation_layer"; 37 repo = "android_translation_layer"; 38 - rev = "d52985a6df81d73a8f6dfbdee337f7ff90b724cb"; 39 - hash = "sha256-fJ8S04YucoCzHiIQdiQd+Il0YGNFsOkSiGWjZKNMTIM="; 40 }; 41 42 patches = [ ··· 51 52 # Patch custon Dex install dir 53 ./configure-dex-install-dir.patch 54 ]; 55 56 postPatch = '' ··· 85 webkitgtk_6_0 86 ]; 87 88 postFixup = '' 89 wrapProgram $out/bin/android-translation-layer \ 90 --prefix LD_LIBRARY_PATH : ${art-standalone}/lib/art \ 91 - --prefix PATH : ${lib.makeBinPath [ bintools ]} 92 ''; 93 94 passthru.tests = {
··· 30 31 stdenv.mkDerivation { 32 pname = "android-translation-layer"; 33 + version = "0-unstable-2025-09-03"; 34 35 src = fetchFromGitLab { 36 owner = "android_translation_layer"; 37 repo = "android_translation_layer"; 38 + rev = "cf93a172b9238e6612b778c7ab76013acebf0ef8"; 39 + hash = "sha256-nnwefW8802ctJRY0aqL+D6MK713eoiQ5K6oVnm5fUOQ="; 40 }; 41 42 patches = [ ··· 51 52 # Patch custon Dex install dir 53 ./configure-dex-install-dir.patch 54 + 55 + # Patch atl to load microg apk from custom path 56 + ./configure-microg-path.patch 57 ]; 58 59 postPatch = '' ··· 88 webkitgtk_6_0 89 ]; 90 91 + postInstall = '' 92 + install -D $src/com.google.android.gms.apk $out/share/com.google.android.gms.apk 93 + ''; 94 + 95 postFixup = '' 96 wrapProgram $out/bin/android-translation-layer \ 97 --prefix LD_LIBRARY_PATH : ${art-standalone}/lib/art \ 98 + --prefix PATH : ${ 99 + lib.makeBinPath [ 100 + art-standalone # dex2oat 101 + bintools # addr2line 102 + ] 103 + } \ 104 + --set MICROG_APK_PATH "$out/share/com.google.android.gms.apk" 105 ''; 106 107 passthru.tests = {