BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #195752 from sheldonneuberger-sc/snn-android-ndk

Browse source
This commit is contained in:
Sandro 2022-11-01 22:54:46 +01:00 committed by GitHub
commit 42e98b3343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
View file

@ -13,7 +13,7 @@ deployAndroidPackage {
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
autoPatchelfIgnoreMissingDeps = true;
buildInputs = lib.optionals (os == "linux") [ pkgs.zlib ];
patchInstructions = lib.optionalString (os == "linux") (''
patchInstructions = ''
patchShebangs .
# TODO: allow this stuff
@ -37,9 +37,11 @@ deployAndroidPackage {
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64
fi
find toolchains -type d -name bin -or -name lib64 | while read dir; do
autoPatchelf "$dir"
done
if [ -d toolchains/llvm/prebuilt/linux-x86_64 ]; then
find toolchains/llvm/prebuilt/linux-x86_64 -type d -name bin -or -name lib64 | while read dir; do
autoPatchelf "$dir"
done
fi
# fix ineffective PROGDIR / MYNDKDIR determination
for progname in ndk-build; do
@ -47,7 +49,9 @@ deployAndroidPackage {
done
# Patch executables
autoPatchelf prebuilt/linux-x86_64
if [ -d prebuild/linux-x86_64 ]; then
autoPatchelf prebuilt/linux-x86_64
fi
# wrap
for progname in ndk-build; do
@ -59,6 +63,6 @@ deployAndroidPackage {
for progname in ndk-build; do
ln -sf ../libexec/android-sdk/ndk-bundle/$progname $out/bin/$progname
done
'');
'';
noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
}