From 8cf6dd815f1b0feae6375bf6fa097e35b4fdf411 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 8 Aug 2022 15:03:08 +0200 Subject: [PATCH] androidenv: fix build of build-tools >= 33 mainDexClasses seems to have been removed in this version of build-tools. (Seems to, because the release notes are not updated at all, unfortunately: https://developer.android.com/studio/releases/build-tools). --- pkgs/development/mobile/androidenv/build-tools.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 641560f19928..da2c3f31a45e 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -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 }