gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android-translation-layer: update art-standalone patch

Browse Source
This commit is contained in:
Jonas Heinrich
2025-09-01 13:01:27 +02:00
parent 02636a0744
commit 17c24ab075
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/an/android-translation-layer/configure-art-path.patch
+21 -11
View File
@@ -1,25 +1,26 @@
diff --git a/meson.build b/meson.build
index 8f525118..c1761a2d 100644
index 8f525118..ba8027c2 100644
--- a/meson.build
+++ b/meson.build
@@ -11,8 +11,8 @@ dir_base = meson.current_source_dir()
@@ -9,22 +9,15 @@ add_project_dependencies(incdir_dep, language: 'c')
cc = meson.get_compiler('c')
dir_base = meson.current_source_dir()
builddir_base = meson.current_build_dir()
# FIXME: make art install a pkgconfig file
libart_dep = [
-# FIXME: make art install a pkgconfig file
-libart_dep = [
- cc.find_library('art', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]),
- cc.find_library('nativebridge', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ])
+ cc.find_library('art', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art', '@artStandalonePackageDir@' / get_option('libdir') / 'art' ]),
+ cc.find_library('nativebridge', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art', '@artStandalonePackageDir@' / get_option('libdir') / 'art' ])
]
-]
+libart_dep = dependency('art-standalone')
libdl_bio_dep = [
cc.find_library('dl_bio')
@@ -21,10 +21,10 @@ libc_bio_dep = [
]
libc_bio_dep = [
cc.find_library('c_bio')
]
libandroidfw_dep = [
-libandroidfw_dep = [
- cc.find_library('androidfw', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]),
+ cc.find_library('androidfw', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art', '@artStandalonePackageDir@' / 'lib' / 'art' ]),
]
-]
-if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar')
- bootclasspath_dir = '/usr' / get_option('libdir') / 'java'
+if fs.is_file('@artStandalonePackageDir@' / get_option('libdir') / 'java/core-all_classes.jar')
@@ -27,3 +28,12 @@ index 8f525118..c1761a2d 100644
elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar')
bootclasspath_dir = '/usr/local' / get_option('libdir') / 'java'
elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar')
@@ -179,7 +172,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [
dependency('gtk4', version: '>=4.14'), dependency('gl'), dependency('egl'), dependency('wayland-client'), dependency('jni'),
dependency('libportal'), dependency('sqlite3'), dependency('libavcodec', version: '>=59'), dependency('libdrm'),
dependency('gudev-1.0'), dependency('libswscale'), dependency('webkitgtk-6.0'),
- libandroidfw_dep, wayland_protos_dep
+ libart_dep, wayland_protos_dep
],
link_with: [ libandroid_so ],
link_args: [
pkgs/by-name/an/android-translation-layer/package.nix
+2
View File
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
};
patches = [
# meson: use pkg-config from art-standalone instead of manual library search
# See: https://gitlab.com/android_translation_layer/android_translation_layer/-/merge_requests/164
(replaceVars ./configure-art-path.patch {
artStandalonePackageDir = "${art-standalone}";
})