From cc60e0d15d79916a69c8a1caeb3c4611351bb6c4 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 1 Mar 2026 23:54:40 +0900 Subject: internal/rosa/make: migrate to helper interface This also updates all affected artifacts to use new behaviour. Signed-off-by: Ophestra --- internal/rosa/xcb.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'internal/rosa/xcb.go') diff --git a/internal/rosa/xcb.go b/internal/rosa/xcb.go index b35c5171..2f9abfc7 100644 --- a/internal/rosa/xcb.go +++ b/internal/rosa/xcb.go @@ -7,12 +7,12 @@ func (t Toolchain) newXCBProto() pkg.Artifact { version = "1.17.0" checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv" ) - return t.NewViaMake("xcb-proto", version, pkg.NewHTTPGetTar( + return t.NewPackage("xcb-proto", version, pkg.NewHTTPGetTar( nil, "https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, - ), nil, - t.Load(Python), + ), nil, (*MakeHelper)(nil), + Python, ) } func init() { artifactsF[XCBProto] = Toolchain.newXCBProto } @@ -22,17 +22,17 @@ func (t Toolchain) newXCB() pkg.Artifact { version = "1.17.0" checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd" ) - return t.NewViaMake("xcb", version, pkg.NewHTTPGetTar( + return t.NewPackage("xcb", version, pkg.NewHTTPGetTar( nil, "https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, - ), nil, - t.Load(Python), - t.Load(PkgConfig), + ), nil, (*MakeHelper)(nil), + Python, + PkgConfig, - t.Load(XCBProto), - t.Load(Xproto), - t.Load(LibXau), + XCBProto, + Xproto, + LibXau, ) } func init() { artifactsF[XCB] = Toolchain.newXCB } -- cgit v1.3.1