Unverified Commit 54ea1a1e authored by numinit's avatar numinit Committed by GitHub
Browse files

androidenv: fix name overriding (#458190)

parents dbb70a88 e1f3d9e0
Loading
Loading
Loading
Loading
+9 −6
Original line number Diff line number Diff line
@@ -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
          )
        )