internal/rosa: key metadata by string

For upcoming azalea integration. The API is quite ugly right now to ease migration.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 112 insertions, 112 deletions

diff --git a/internal/rosa/x.go b/internal/rosa/x.go
index e67be3b5..5806d967 100644
--- a/internal/rosa/x.go
+++ b/internal/rosa/x.go
@@ -2,12 +2,12 @@ package rosa
 
 import "hakurei.app/internal/pkg"
 
-func (t Toolchain) newUtilMacros() (pkg.Artifact, string) {
+func (t Toolchain) newUtilMacros(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.20.2"
 		checksum = "Ze8QH3Z3emC0pWFP-0nUYeMy7aBW3L_dxBBmVgcumIHNzEKc1iGTR-yUFR3JcM1G"
 	)
-	return t.NewPackage("util-macros", version, newTar(
+	return s.NewPackage(t, "util-macros", version, newTar(
 		"https://www.x.org/releases/individual/util/"+
 			"util-macros-"+version+".tar.gz",
 		checksum,
@@ -15,7 +15,7 @@ func (t Toolchain) newUtilMacros() (pkg.Artifact, string) {
 	), nil, (*MakeHelper)(nil)), version
 }
 func init() {
-	artifactsM[utilMacros] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newUtilMacros,
 
 		Name:        "util-macros",
@@ -23,15 +23,15 @@ func init() {
 		Website:     "https://xorg.freedesktop.org/",
 
 		ID: 5252,
-	}
+	})
 }
 
-func (t Toolchain) newLibxtrans() (pkg.Artifact, string) {
+func (t Toolchain) newLibxtrans(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.6.0"
 		checksum = "1cxDCF59fLf1HyGDMcjR1L50ZbjD0RTTEDUpOJYcHXu6HUK_Ds0x-KREY7rLNxu9"
 	)
-	return t.NewPackage("libxtrans", version, newFromGitLab(
+	return s.NewPackage(t, "libxtrans", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxtrans",
 		"xtrans-"+version,
@@ -47,7 +47,7 @@ func (t Toolchain) newLibxtrans() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Libxtrans] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxtrans,
 
 		Name:        "libxtrans",
@@ -55,15 +55,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxtrans",
 
 		ID: 13441,
-	}
+	})
 }
 
-func (t Toolchain) newXorgProto() (pkg.Artifact, string) {
+func (t Toolchain) newXorgProto(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2025.1"
 		checksum = "pTwJiBJHKA6Rgm3cVDXy1lyvXNIUzTRaukvvYdk1xWoJ_1G-Dfjm9MyewuyIjoHz"
 	)
-	return t.NewPackage("xorgproto", version, newFromGitLab(
+	return s.NewPackage(t, "xorgproto", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/proto/xorgproto",
 		"xorgproto-"+version,
@@ -78,7 +78,7 @@ func (t Toolchain) newXorgProto() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[XorgProto] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newXorgProto,
 
 		Name:        "xorgproto",
@@ -86,15 +86,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/proto/xorgproto",
 
 		ID: 17190,
-	}
+	})
 }
 
-func (t Toolchain) newLibXau() (pkg.Artifact, string) {
+func (t Toolchain) newLibXau(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.0.12"
 		checksum = "G9AjnU_C160q814MCdjFOVt_mQz_pIt4wf4GNOQmGJS3UuuyMw53sfPvJ7WOqwXN"
 	)
-	return t.NewPackage("libXau", version, newTar(
+	return s.NewPackage(t, "libXau", version, newTar(
 		"https://www.x.org/releases/individual/lib/"+
 			"libXau-"+version+".tar.gz",
 		checksum,
@@ -112,7 +112,7 @@ func (t Toolchain) newLibXau() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXau] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXau,
 
 		Name:        "libXau",
@@ -124,15 +124,15 @@ func init() {
 		},
 
 		ID: 1765,
-	}
+	})
 }
 
-func (t Toolchain) newXCBProto() (pkg.Artifact, string) {
+func (t Toolchain) newXCBProto(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.17.0"
 		checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv"
 	)
-	return t.NewPackage("xcb-proto", version, newTar(
+	return s.NewPackage(t, "xcb-proto", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -141,7 +141,7 @@ func (t Toolchain) newXCBProto() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[XCBProto] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newXCBProto,
 
 		Name:        "xcb-proto",
@@ -149,15 +149,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/proto/xcbproto",
 
 		ID: 13646,
-	}
+	})
 }
 
-func (t Toolchain) newXCB() (pkg.Artifact, string) {
+func (t Toolchain) newXCB(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.17.0"
 		checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd"
 	)
-	return t.NewPackage("xcb", version, newTar(
+	return s.NewPackage(t, "xcb", version, newTar(
 		"https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -170,7 +170,7 @@ func (t Toolchain) newXCB() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[XCB] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newXCB,
 
 		Name:        "xcb",
@@ -183,15 +183,15 @@ func init() {
 		},
 
 		ID: 1767,
-	}
+	})
 }
 
-func (t Toolchain) newLibxcbUtilKeysyms() (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtilKeysyms(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.4.1"
 		checksum = "-EEje12UEjtFBuIjb6Fy4cxEghV20BXwQ1BLvhtvSuVcrFkp_X-ZHRM48wAspXZ4"
 	)
-	return t.NewPackage("libxcb-util-keysyms", version, newTar(
+	return s.NewPackage(t, "libxcb-util-keysyms", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-util-keysyms-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -202,7 +202,7 @@ func (t Toolchain) newLibxcbUtilKeysyms() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibxcbUtilKeysyms] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxcbUtilKeysyms,
 
 		Name:        "libxcb-util-keysyms",
@@ -214,15 +214,15 @@ func init() {
 		},
 
 		ID: 5168,
-	}
+	})
 }
 
-func (t Toolchain) newLibxcbUtilImage() (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtilImage(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.4.1"
 		checksum = "47pvXmFwaUBZIrJ4CE9xjTQIFyxeqoNAL-DshlB11GZ_jjI3G1a6KF0K7mtBQ1E7"
 	)
-	return t.NewPackage("libxcb-util-image", version, newTar(
+	return s.NewPackage(t, "libxcb-util-image", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-util-image-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -233,7 +233,7 @@ func (t Toolchain) newLibxcbUtilImage() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibxcbUtilImage] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxcbUtilImage,
 
 		Name:        "libxcb-util-image",
@@ -245,15 +245,15 @@ func init() {
 		},
 
 		ID: 5168,
-	}
+	})
 }
 
-func (t Toolchain) newLibxcbUtilWM() (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtilWM(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.4.2"
 		checksum = "g0VZgMU9hcIgyXb3XxBR9xqsvUMBd9qt_Dbmwoj2h5y24pODr_S_D0DhRsuXUNjF"
 	)
-	return t.NewPackage("libxcb-util-wm", version, newTar(
+	return s.NewPackage(t, "libxcb-util-wm", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-util-wm-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -265,7 +265,7 @@ func (t Toolchain) newLibxcbUtilWM() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibxcbUtilWM] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxcbUtilWM,
 
 		Name:        "libxcb-util-wm",
@@ -277,15 +277,15 @@ func init() {
 		},
 
 		ID: 5170,
-	}
+	})
 }
 
-func (t Toolchain) newLibxcbUtil() (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtil(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.4.1"
 		checksum = "YMXGQUQbF6PoEAGflvYnJYsLWjti6sL_ifY47wIXTNGVM3tQ8u41nkBYN4K1D5CD"
 	)
-	return t.NewPackage("libxcb-util", version, newTar(
+	return s.NewPackage(t, "libxcb-util", version, newTar(
 		"https://www.x.org/releases/individual/xcb/"+
 			"xcb-util-"+version+".tar.gz",
 		checksum,
@@ -298,7 +298,7 @@ func (t Toolchain) newLibxcbUtil() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibxcbUtil] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxcbUtil,
 
 		Name:        "libxcb-util",
@@ -310,15 +310,15 @@ func init() {
 		},
 
 		ID: 5165,
-	}
+	})
 }
 
-func (t Toolchain) newLibxcbRenderUtil() (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbRenderUtil(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.3.10"
 		checksum = "n08L8PyCoOd7v2vb6fSVq5Pq6JtteXVh9K2wrQMTNwGMf_Fjpi6i3HWF-TMFSVTI"
 	)
-	return t.NewPackage("libxcb-render-util", version, newTar(
+	return s.NewPackage(t, "libxcb-render-util", version, newTar(
 		"https://www.x.org/releases/individual/xcb/"+
 			"xcb-util-renderutil-"+version+".tar.gz",
 		checksum,
@@ -331,7 +331,7 @@ func (t Toolchain) newLibxcbRenderUtil() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibxcbRenderUtil] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxcbRenderUtil,
 
 		Name:        "libxcb-render-util",
@@ -343,15 +343,15 @@ func init() {
 		},
 
 		ID: 5169,
-	}
+	})
 }
 
-func (t Toolchain) newLibX11() (pkg.Artifact, string) {
+func (t Toolchain) newLibX11(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.8.13"
 		checksum = "ARh-cuZY_U2v3DbPS1byc7ybh9NInZc-yav7SJiusk_C7408s058qWV83ocMd2pT"
 	)
-	return t.NewPackage("libX11", version, newFromGitLab(
+	return s.NewPackage(t, "libX11", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libx11",
 		"libX11-"+version,
@@ -375,7 +375,7 @@ func (t Toolchain) newLibX11() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibX11] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibX11,
 
 		Name:        "libX11",
@@ -387,15 +387,15 @@ func init() {
 		},
 
 		ID: 1764,
-	}
+	})
 }
 
-func (t Toolchain) newLibXext() (pkg.Artifact, string) {
+func (t Toolchain) newLibXext(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.3.7"
 		checksum = "-0wvUDaucLPLNOrK1pcKhHNoO-5nUqQyyw6JAbhx65gRjuMiNKKaF2_tcrbC_KNq"
 	)
-	return t.NewPackage("libXext", version, newFromGitLab(
+	return s.NewPackage(t, "libXext", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxext",
 		"libXext-"+version,
@@ -412,7 +412,7 @@ func (t Toolchain) newLibXext() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXext] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXext,
 
 		Name:        "libXext",
@@ -424,15 +424,15 @@ func init() {
 		},
 
 		ID: 1774,
-	}
+	})
 }
 
-func (t Toolchain) newLibXfixes() (pkg.Artifact, string) {
+func (t Toolchain) newLibXfixes(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "6.0.2"
 		checksum = "_-kJfKZ7cE3NNeMr6NLSXCmsyP7MVEHVPLNfxatz2qBy3_fZJvPMQwZNOC9y6V5L"
 	)
-	return t.NewPackage("libXfixes", version, newFromGitLab(
+	return s.NewPackage(t, "libXfixes", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxfixes",
 		"libXfixes-"+version,
@@ -450,7 +450,7 @@ func (t Toolchain) newLibXfixes() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXfixes] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXfixes,
 
 		Name:        "libXfixes",
@@ -462,15 +462,15 @@ func init() {
 		},
 
 		ID: 1775,
-	}
+	})
 }
 
-func (t Toolchain) newLibXrender() (pkg.Artifact, string) {
+func (t Toolchain) newLibXrender(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.9.12"
 		checksum = "s6nWn-r17X_W-7anaS7wIcq5_Levf9zAigwJDD9Klp-cCJTVDhLo7GufuVOrxVP0"
 	)
-	return t.NewPackage("libXrender", version, newFromGitLab(
+	return s.NewPackage(t, "libXrender", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxrender",
 		"libXrender-"+version,
@@ -487,7 +487,7 @@ func (t Toolchain) newLibXrender() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXrender] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXrender,
 
 		Name:        "libXrender",
@@ -499,15 +499,15 @@ func init() {
 		},
 
 		ID: 1789,
-	}
+	})
 }
 
-func (t Toolchain) newLibxshmfence() (pkg.Artifact, string) {
+func (t Toolchain) newLibxshmfence(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.3.3"
 		checksum = "JamExTPg81By2fs3vWdeo_dzlpBQeAwXr2sDXeHJqm9XBoLW5pamiD6FgAWtAKyA"
 	)
-	return t.NewPackage("libxshmfence", version, newFromGitLab(
+	return s.NewPackage(t, "libxshmfence", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxshmfence",
 		"libxshmfence-"+version,
@@ -524,7 +524,7 @@ func (t Toolchain) newLibxshmfence() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Libxshmfence] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxshmfence,
 
 		Name:        "libxshmfence",
@@ -532,15 +532,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxshmfence",
 
 		ID: 1792,
-	}
+	})
 }
 
-func (t Toolchain) newLibXxf86vm() (pkg.Artifact, string) {
+func (t Toolchain) newLibXxf86vm(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.1.7"
 		checksum = "mS4cgKWrwz6M1Lb6Qu4ZVh8Xn2Ca_4HXPxr3LDad4iYY1LecZfeLUPW1hkp6amX_"
 	)
-	return t.NewPackage("libXxf86vm", version, newFromGitLab(
+	return s.NewPackage(t, "libXxf86vm", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxxf86vm",
 		"libXxf86vm-"+version,
@@ -558,7 +558,7 @@ func (t Toolchain) newLibXxf86vm() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXxf86vm] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXxf86vm,
 
 		Name:        "libXxf86vm",
@@ -570,15 +570,15 @@ func init() {
 		},
 
 		ID: 1799,
-	}
+	})
 }
 
-func (t Toolchain) newLibXrandr() (pkg.Artifact, string) {
+func (t Toolchain) newLibXrandr(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.5.5"
 		checksum = "OF7C7VC5MwnFue9UX5UnIkG1PIWvn9bBMq6d4mVyJJ_rcF0w4Kedn1lfxBsXEKAP"
 	)
-	return t.NewPackage("libXrandr", version, newFromGitLab(
+	return s.NewPackage(t, "libXrandr", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxrandr",
 		"libXrandr-"+version,
@@ -597,7 +597,7 @@ func (t Toolchain) newLibXrandr() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXrandr] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXrandr,
 
 		Name:        "libXrandr",
@@ -610,15 +610,15 @@ func init() {
 		},
 
 		ID: 1788,
-	}
+	})
 }
 
-func (t Toolchain) newFontUtil() (pkg.Artifact, string) {
+func (t Toolchain) newFontUtil(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.4.2"
 		checksum = "YWiaIxkq-N2yNdbGa_RF1S0UkQq6xsgoRT73WZP2DOmyH_CJ0TAkpQjId657MQmh"
 	)
-	return t.NewPackage("font-util", version, newFromGitLab(
+	return s.NewPackage(t, "font-util", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/font/util",
 		"font-util-"+version,
@@ -634,7 +634,7 @@ func (t Toolchain) newFontUtil() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[FontUtil] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newFontUtil,
 
 		Name:        "font-util",
@@ -642,15 +642,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/font/util",
 
 		ID: 15055,
-	}
+	})
 }
 
-func (t Toolchain) newLibfontenc() (pkg.Artifact, string) {
+func (t Toolchain) newLibfontenc(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.1.9"
 		checksum = "XqosXfbVwaoYzG9vVyRCl3eatwjASoJdLZsxQ37NN8S_jTyqNmbxpRSJGImJj7RS"
 	)
-	return t.NewPackage("libfontenc", version, newFromGitLab(
+	return s.NewPackage(t, "libfontenc", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libfontenc",
 		"libfontenc-"+version,
@@ -668,7 +668,7 @@ func (t Toolchain) newLibfontenc() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Libfontenc] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibfontenc,
 
 		Name:        "libfontenc",
@@ -676,15 +676,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libfontenc",
 
 		ID: 1613,
-	}
+	})
 }
 
-func (t Toolchain) newLibxkbfile() (pkg.Artifact, string) {
+func (t Toolchain) newLibxkbfile(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.2.0"
 		checksum = "WUtph1ab0AyATahlwljchBxZJcpjYrjyhCK9DW2VO0uXEXaN22GWmUaibcA83i_B"
 	)
-	return t.NewPackage("libxkbfile", version, newFromGitLab(
+	return s.NewPackage(t, "libxkbfile", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxkbfile",
 		"libxkbfile-"+version,
@@ -694,7 +694,7 @@ func (t Toolchain) newLibxkbfile() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Libxkbfile] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxkbfile,
 
 		Name:        "libxkbfile",
@@ -706,15 +706,15 @@ func init() {
 		},
 
 		ID: 1781,
-	}
+	})
 }
 
-func (t Toolchain) newXkbcomp() (pkg.Artifact, string) {
+func (t Toolchain) newXkbcomp(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.5.0"
 		checksum = "ttICW8ZPbljI-nw2kknvxFhwFoDK40iAMBeZDLAHYsHf3B6UPO_zc9TpzZYRRyZH"
 	)
-	return t.NewPackage("xkbcomp", version, newFromGitLab(
+	return s.NewPackage(t, "xkbcomp", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/app/xkbcomp",
 		"xkbcomp-"+version,
@@ -732,7 +732,7 @@ func (t Toolchain) newXkbcomp() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Xkbcomp] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newXkbcomp,
 
 		Name:        "xkbcomp",
@@ -744,15 +744,15 @@ func init() {
 		},
 
 		ID: 15018,
-	}
+	})
 }
 
-func (t Toolchain) newLibXfont2() (pkg.Artifact, string) {
+func (t Toolchain) newLibXfont2(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.0.7"
 		checksum = "jv9BZNA02493KB8j1lfAErF5SA3ZFcAhm3_UVJ--Bp1maz-vNprl_wXpkHApBi9M"
 	)
-	return t.NewPackage("libXfont2", version, newFromGitLab(
+	return s.NewPackage(t, "libXfont2", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxfont",
 		"libXfont2-"+version,
@@ -772,7 +772,7 @@ func (t Toolchain) newLibXfont2() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXfont2] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXfont2,
 
 		Name:        "libXfont2",
@@ -785,15 +785,15 @@ func init() {
 		},
 
 		ID: 17165,
-	}
+	})
 }
 
-func (t Toolchain) newLibxcvt() (pkg.Artifact, string) {
+func (t Toolchain) newLibxcvt(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.1.3"
 		checksum = "IfIA7SxlHMWh681e1AgYmZcRAfkZd5LlzmqcMRifNY5nNVRrUx_wnoaidAv0Yu03"
 	)
-	return t.NewPackage("libxcvt", version, newFromGitLab(
+	return s.NewPackage(t, "libxcvt", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxcvt",
 		"libxcvt-"+version,
@@ -801,7 +801,7 @@ func (t Toolchain) newLibxcvt() (pkg.Artifact, string) {
 	), nil, (*MesonHelper)(nil)), version
 }
 func init() {
-	artifactsM[Libxcvt] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibxcvt,
 
 		Name:        "libxcvt",
@@ -809,15 +809,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcvt",
 
 		ID: 235147,
-	}
+	})
 }
 
-func (t Toolchain) newLibXdmcp() (pkg.Artifact, string) {
+func (t Toolchain) newLibXdmcp(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.1.5"
 		checksum = "N6AJSv9pmeBedFn8KuSIOUGvTken4rkypNWVE2KfPlliwkfIbhfXrt5YHZkBMUHp"
 	)
-	return t.NewPackage("libXdmcp", version, newFromGitLab(
+	return s.NewPackage(t, "libXdmcp", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxdmcp",
 		"libXdmcp-"+version,
@@ -834,7 +834,7 @@ func (t Toolchain) newLibXdmcp() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[LibXdmcp] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibXdmcp,
 
 		Name:        "libXdmcp",
@@ -842,15 +842,15 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxdmcp",
 
 		ID: 1772,
-	}
+	})
 }
 
-func (t Toolchain) newXkeyboardConfig() (pkg.Artifact, string) {
+func (t Toolchain) newXkeyboardConfig(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.47"
 		checksum = "E03PsPIaRrxPAuKgDGSQyPiJB49wXtyyvdV0lVx3_G-pelMMlaFLkoTDHTHG_qgA"
 	)
-	return t.NewPackage("xkeyboard-config", version, newFromGitLab(
+	return s.NewPackage(t, "xkeyboard-config", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xkeyboard-config/xkeyboard-config",
 		"xkeyboard-config-"+version,
@@ -860,7 +860,7 @@ func (t Toolchain) newXkeyboardConfig() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[XkeyboardConfig] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newXkeyboardConfig,
 
 		Name:        "xkeyboard-config",
@@ -868,15 +868,15 @@ func init() {
 		Website:     "https://www.freedesktop.org/wiki/Software/XKeyboardConfig/",
 
 		ID: 5191,
-	}
+	})
 }
 
-func (t Toolchain) newLibpciaccess() (pkg.Artifact, string) {
+func (t Toolchain) newLibpciaccess(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "0.19"
 		checksum = "84H0c_U_7fMqo81bpuwyXGXtk4XvvFH_YK00UiOriv3YGsuAhmbo2IkFhmJnvu2x"
 	)
-	return t.NewPackage("libpciaccess", version, newFromGitLab(
+	return s.NewPackage(t, "libpciaccess", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libpciaccess",
 		"libpciaccess-"+version,
@@ -888,7 +888,7 @@ func (t Toolchain) newLibpciaccess() (pkg.Artifact, string) {
 	}), version
 }
 func init() {
-	artifactsM[Libpciaccess] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibpciaccess,
 
 		Name:        "libpciaccess",
@@ -900,15 +900,15 @@ func init() {
 		},
 
 		ID: 1703,
-	}
+	})
 }
 
-func (t Toolchain) newXserver() (pkg.Artifact, string) {
+func (t Toolchain) newXserver(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "21.1.22"
 		checksum = "prLT2wKecBu5m9w1ThgIt0GvenNpjKXoOyvTiMA1oQTlP0QHh6QiWsdvH3OmUwNo"
 	)
-	return t.NewPackage("xserver", version, newFromGitLab(
+	return s.NewPackage(t, "xserver", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/xserver",
 		"xorg-server-"+version,
@@ -955,7 +955,7 @@ func (t Toolchain) newXserver() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Xserver] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newXserver,
 
 		Name:        "xserver",
@@ -984,5 +984,5 @@ func init() {
 		},
 
 		ID: 5250,
-	}
+	})
 }