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

Merge pull request #313255 from Philipp-M/androidenv-fix-ndk-toolchains

Browse Source 
androidenv: fix NDK toolchain linking issues
This commit is contained in:
Domen Kožar 2024-05-29 12:04:41 +02:00 committed by GitHub
commit ac82a513e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
View File

@ -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