From cbf18b302d51c3e667ebe06cfebb14b90ccc93b7 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 21 May 2026 15:35:48 +0900 Subject: internal/rosa/package: migrate nss Signed-off-by: Ophestra --- internal/rosa/ninja.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'internal/rosa/ninja.go') diff --git a/internal/rosa/ninja.go b/internal/rosa/ninja.go index 0f29d186..74f82998 100644 --- a/internal/rosa/ninja.go +++ b/internal/rosa/ninja.go @@ -2,8 +2,7 @@ package rosa import "hakurei.app/internal/pkg" -// Ninja is the build system used by [CMakeHelper] and [MesonHelper]. -var Ninja = H("ninja") +var _ninja = H("ninja") func init() { const ( @@ -19,11 +18,11 @@ func init() { ID: 2089, } native.MustRegister(meta.Name, func(t Toolchain) (*Metadata, pkg.Artifact) { - _, _python := t.Load(Python) - _, _bash := t.Load(bash) + _, python := t.Load(_python) + _, bash := t.Load(_bash) return &meta, t.New(meta.Name+"-"+version, 0, []pkg.Artifact{ - _python, - _bash, + python, + bash, }, nil, nil, ` cd "$(mktemp -d)" python3 /usr/src/ninja/configure.py \ @@ -43,7 +42,7 @@ cp ninja /work/system/bin/ "NjLGvSbgPy_B-y-o1hdanlzEzaYeStFcvFGxpYV3KYlhrWWFRcugYhM3ZMzOA9B_", pkg.TarGzip, )), pkg.Path(AbsUsrSrc.Append("ninja"), true, t.NewPatchedSource( - meta.Name, version, newFromGitHub( + meta.Name+"-"+version, newFromGitHub( "ninja-build/ninja", "v"+version, checksum, -- cgit v1.3.1