tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / by-name / an / android-translation-layer / configure-art-path.patch
at devShellTools-shell 29 lines 2.2 kB view raw
1diff --git a/meson.build b/meson.build 2index 8f525118..c1761a2d 100644 3--- a/meson.build 4+++ b/meson.build 5@@ -11,8 +11,8 @@ dir_base = meson.current_source_dir() 6 builddir_base = meson.current_build_dir() 7 # FIXME: make art install a pkgconfig file 8 libart_dep = [ 9- cc.find_library('art', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]), 10- cc.find_library('nativebridge', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]) 11+ 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' ]), 12+ 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' ]) 13 ] 14 libdl_bio_dep = [ 15 cc.find_library('dl_bio') 16@@ -21,10 +21,10 @@ libc_bio_dep = [ 17 cc.find_library('c_bio') 18 ] 19 libandroidfw_dep = [ 20- cc.find_library('androidfw', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]), 21+ 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' ]), 22 ] 23-if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar') 24- bootclasspath_dir = '/usr' / get_option('libdir') / 'java' 25+if fs.is_file('@artStandalonePackageDir@' / get_option('libdir') / 'java/core-all_classes.jar') 26+ bootclasspath_dir = '@artStandalonePackageDir@' / get_option('libdir') / 'java' 27 elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar') 28 bootclasspath_dir = '/usr/local' / get_option('libdir') / 'java' 29 elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar')