Unverified Commit ac82a513 authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

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

androidenv: fix NDK toolchain linking issues
parents d9493dcd de0fdc1c

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