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

Merge pull request #80107 from phryneas/fix-build-tools

Browse Source 
androidenv build-tools: fix old versions under linux
This commit is contained in:
Matthew Bauer 2020-02-14 13:35:04 -05:00 committed by GitHub
commit 95f735008a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/mobile/androidenv/build-tools.nix
View File

@ -7,8 +7,10 @@ deployAndroidPackage {
patchInstructions = '' patchInstructions = ''
${lib.optionalString (os == "linux") '' ${lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib addAutoPatchelfSearchPath $packageBaseDir/lib
addAutoPatchelfSearchPath $packageBaseDir/lib64 if [[ -d $packageBaseDir/lib64 ]]; then
autoPatchelf --no-recurse $packageBaseDir/lib64 addAutoPatchelfSearchPath $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir/lib64
fi
autoPatchelf --no-recurse $packageBaseDir autoPatchelf --no-recurse $packageBaseDir
''} ''}