Unverified Commit de0fdc1c authored by Philipp Mildenberger's avatar Philipp Mildenberger
Browse files

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.
parent 26c9d4cc

pkgs/development/mobile/androidenv/ndk-bundle/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -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