diff options
| author | Domen Kožar <domen@dev.si> | 2024-05-29 12:04:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-29 12:04:41 +0200 |
| commit | ac82a513e55582291805d6f09d35b6d8b60637a1 (patch) | |
| tree | 8a4a3e1d819aaa5aeb4b137fb01e842b0a917c72 /pkgs | |
| parent | d9493dcdc9fb45ba9bfe16271e9274c90af6b906 (diff) | |
| parent | de0fdc1c784e8742d96ca18b1691a368f8b87e75 (diff) | |
Merge pull request #313255 from Philipp-M/androidenv-fix-ndk-toolchains
androidenv: fix NDK toolchain linking issues
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 0b104abe1f9a9..30a2e8171acc1 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 |