Merge pull request #94452 from eyJhb/androidenv-build-tools

androidenv.build-tools: add libc++ to enable buildToolsVersion 29.0.3
This commit is contained in:
adisbladis 2020-08-05 14:11:02 +02:00 committed by GitHub
commit 0ad748cc2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3,7 +3,7 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook makeWrapper ] ++
lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ];
lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib