androidenv: fix name overriding

Use `overrideAttrs` to specify the FOD name we want, instead of specifying `pname` and `version` and expect a broken overrideAttrs that won't update `name`.
2025-11-04 02:25:57 +08:00
parent 94fc102d2c
commit e1f3d9e0ae
1 changed files with 9 additions and 6 deletions
@@ -190,18 +190,21 @@ let
            map (
              archive:
              (fetchurl {
+                pname = packageInfo.name;
+                version = packageInfo.revision;
                inherit (archive) url sha1;
                inherit meta;
                passthru = {
                  info = packageInfo;
                };
              }).overrideAttrs
-                (prev: {
-                  # fetchurl won't generate the correct filename if we specify pname and version,
-                  # and we still want the version attribute to show up in search, so specify these in an override
-                  pname = packageInfo.name;
-                  version = packageInfo.revision;
-                })
+                (
+                  finalAttrs: previousAttrs: {
+                    # fetchurl prioritize `pname` and `version` over the specified `name`,
+                    # so specify custom `name` in an override.
+                    name = baseNameOf (lib.head (finalAttrs.urls));
+                  }
+                )
            ) validArchives
          )
        )