internal/rosa: create metadata alongside artifact

This enables deferring evaluation of azalea-based packages and fixes the longstanding quirk of version being disjoint from other metadata.

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

1 files changed, 4 insertions, 12 deletions

diff --git a/internal/rosa/glslang.go b/internal/rosa/glslang.go
index 969cf2ad..c51c7937 100644
--- a/internal/rosa/glslang.go
+++ b/internal/rosa/glslang.go
@@ -22,9 +22,7 @@ func (t Toolchain) newSPIRVHeaders() (pkg.Artifact, string) {
 	}), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newSPIRVHeaders,
-
+	native.mustRegister(Toolchain.newSPIRVHeaders, &Metadata{
 		Name:        "spirv-headers",
 		Description: "machine-readable files for the SPIR-V Registry",
 		Website:     "https://github.com/KhronosGroup/SPIRV-Headers",
@@ -72,9 +70,7 @@ func (t Toolchain) newSPIRVTools() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newSPIRVTools,
-
+	native.mustRegister(Toolchain.newSPIRVTools, &Metadata{
 		Name:        "spirv-tools",
 		Description: "an API and commands for processing SPIR-V modules",
 		Website:     "https://github.com/KhronosGroup/SPIRV-Tools",
@@ -116,9 +112,7 @@ func (t Toolchain) newGlslang() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newGlslang,
-
+	native.mustRegister(Toolchain.newGlslang, &Metadata{
 		Name:        "glslang",
 		Description: "reference front end for GLSL/ESSL",
 		Website:     "https://github.com/KhronosGroup/glslang",
@@ -232,9 +226,7 @@ export LIT_OPTS=` + litArgs(true, skipChecks...) + `
 	), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newSPIRVLLVMTranslator,
-
+	native.mustRegister(Toolchain.newSPIRVLLVMTranslator, &Metadata{
 		Name:        "spirv-llvm-translator",
 		Description: "bi-directional translation between SPIR-V and LLVM IR",
 		Website:     "https://github.com/KhronosGroup/SPIRV-LLVM-Translator",