From de0fdc1c784e8742d96ca18b1691a368f8b87e75 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Tue, 21 May 2024 00:08:09 +0200 Subject: [PATCH] androidenv: fix NDK toolchain linking issues Fixes #298285, alternative to #300386. As suggested in #298285 `lib64` was renamed to `lib`, so just doing the same as for `lib64` seems to fix the issue. See also recent discussion in #300386. --- pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 0b104abe1f9a..30a2e8171acc 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -24,7 +24,11 @@ deployAndroidPackage rec { 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 + if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib ]; then + addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib + fi + + find toolchains -type d -name bin -or -name lib64 -or -name lib | while read dir; do autoPatchelf "$dir" done