forked from rosa/hakurei
internal/rosa/python: pass build dependencies separately
This is cleaner with less duplicate code. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -169,22 +169,23 @@ pip3 install \
|
||||
func newPythonPackage(
|
||||
name string, id int, description, website, version string,
|
||||
source pkg.Artifact, attrP *PackageAttr, attr *PipHelper,
|
||||
dependencies P, extra ...PArtifact,
|
||||
build P, extra ...PArtifact,
|
||||
) Metadata {
|
||||
name = "python-" + name
|
||||
if dependencies == nil {
|
||||
dependencies = slices.Concat(P{Python}, extra)
|
||||
}
|
||||
return Metadata{
|
||||
f: func(t Toolchain) (pkg.Artifact, string) {
|
||||
return t.NewPackage(name, version, source, attrP, attr, extra...), version
|
||||
return t.NewPackage(name, version, source, attrP, attr, slices.Concat(
|
||||
P{Python},
|
||||
extra,
|
||||
build,
|
||||
)...), version
|
||||
},
|
||||
|
||||
Name: name,
|
||||
Description: description,
|
||||
Website: website,
|
||||
|
||||
Dependencies: dependencies,
|
||||
Dependencies: slices.Concat(P{Python}, extra),
|
||||
|
||||
ID: id,
|
||||
}
|
||||
@@ -285,8 +286,7 @@ func init() {
|
||||
version, newFromGitHub(
|
||||
"cpburnz/python-pathspec",
|
||||
"v"+version, checksum,
|
||||
), nil, nil, nil,
|
||||
PythonFlitCore,
|
||||
), nil, nil, P{PythonFlitCore},
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user