modules: update deps

Author: jaen

modules/envpackages.nix

@@ -29,7 +29,15 @@ in
       nettools # Needed for "hostname" in build/soong/ui/build/sandbox_linux.go
       procps # Needed for "ps" in build/envsetup.sh
     ]
-    (mkIf (config.androidVersion >= 10) [
+    (mkIf (config.androidVersion >= 12) [
+      freetype # Needed by jdk9 prebuilt
+      fontconfig
+
+      # Goldfish doesn't need py2 anymore in Android 12+!
+      # c.f. https://android.googlesource.com/device/generic/goldfish/+/605e6a14e44c99e87d48bf52507f8aa01633fb04
+      python3
+    ])
+    (mkIf ((config.androidVersion >= 10) && (config.androidVersion <= 11)) [
       freetype # Needed by jdk9 prebuilt
       fontconfig
 

modules/release.nix

@@ -12,7 +12,9 @@ let
     jre = if (config.androidVersion >= 11) then pkgs.jdk11_headless else pkgs.jre8_headless;
     deps = with pkgs;
       [ otaTools openssl jre zip unzip pkgs.getopt which toybox vboot_reference util-linux
-        python # ota_from_target_files invokes, brillo_update_payload which has "truncate_file" which invokes python
+        # ota_from_target_files invokes, brillo_update_payload which has "truncate_file" which invokes python
+        # c.f. https://android.googlesource.com/platform/system/update_engine/+/refs/heads/main/scripts/brillo_update_payload#338
+        python3
       ];
   in ''
     export PATH=${lib.makeBinPath deps}:$PATH