diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-17 16:44:13 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-17 17:50:30 +0900 |
| commit | 38bc2c750842826c5af4f66abe3e1905258cd274 (patch) | |
| tree | 75e1d17961fd980ff8b20a9dfd937789de10836e /internal/rosa/ninja.go | |
| parent | 30eb0d6a613ad268f6805ccbcdcabf158e7f526f (diff) | |
internal/rosa: pass stage alongside state
This cleans up many function signatures.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/ninja.go')
| -rw-r--r-- | internal/rosa/ninja.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/rosa/ninja.go b/internal/rosa/ninja.go index 3801d3ee..d34d7841 100644 --- a/internal/rosa/ninja.go +++ b/internal/rosa/ninja.go @@ -2,14 +2,14 @@ package rosa import "hakurei.app/internal/pkg" -func (t Toolchain) newNinja(s *S) (pkg.Artifact, string) { +func (t Toolchain) newNinja() (pkg.Artifact, string) { const ( version = "1.13.2" checksum = "ygKWMa0YV2lWKiFro5hnL-vcKbc_-RACZuPu0Io8qDvgQlZ0dxv7hPNSFkt4214v" ) - python, _ := s.Load(t, Python) - bash, _ := s.Load(t, Bash) - return s.New(t, "ninja-"+version, 0, []pkg.Artifact{ + python, _ := t.Load(Python) + bash, _ := t.Load(Bash) + return t.New("ninja-"+version, 0, []pkg.Artifact{ python, bash, }, nil, nil, ` @@ -30,7 +30,7 @@ cp ninja /work/system/bin/ "googletest-1.16.0.tar.gz", "NjLGvSbgPy_B-y-o1hdanlzEzaYeStFcvFGxpYV3KYlhrWWFRcugYhM3ZMzOA9B_", pkg.TarGzip, - )), pkg.Path(AbsUsrSrc.Append("ninja"), true, s.NewPatchedSource(t, + )), pkg.Path(AbsUsrSrc.Append("ninja"), true, t.NewPatchedSource( "ninja", version, newFromGitHub( "ninja-build/ninja", "v"+version, |