mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 00:53:12 +03:00
Merge pull request #185663 from chvp/androidenv-build-tools-33
This commit is contained in:
commit
55354feded
@ -14,8 +14,10 @@ deployAndroidPackage {
|
||||
autoPatchelf --no-recurse $packageBaseDir
|
||||
''}
|
||||
|
||||
wrapProgram $PWD/mainDexClasses \
|
||||
--prefix PATH : ${pkgs.jdk8}/bin
|
||||
${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) ''
|
||||
wrapProgram $PWD/mainDexClasses \
|
||||
--prefix PATH : ${pkgs.jdk8}/bin
|
||||
''}
|
||||
'';
|
||||
noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user