fastly: specify go OS and arch explicitly

Use `GOHOSTOS` and `GOHOSTARCH` instead of `go version`; supported in
the fastly source code since e2f1500bf591e919e3fd9683294ac9d5b0606789.
This commit is contained in:
Rafael Fernández López 2022-07-26 16:29:06 +02:00
parent 2d9b7cb5f0
commit e05e2253c6
No known key found for this signature in database
GPG Key ID: A07C55EEE4CCE570
2 changed files with 6 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, installShellFiles, buildGoModule }:
{ lib, fetchFromGitHub, installShellFiles, buildGoModule, go }:
buildGoModule rec {
pname = "fastly";
@ -34,10 +34,11 @@ buildGoModule rec {
"-w"
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${version}"
"-X github.com/fastly/cli/pkg/revision.Environment=release"
"-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"
];
preBuild = ''
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
ldflags+=" -X 'github.com/fastly/cli/pkg/revision.GoVersion=$(go version)'"
'';
postInstall = ''

View File

@ -3709,7 +3709,9 @@ with pkgs;
extrude = callPackage ../tools/security/extrude { };
fastly = callPackage ../misc/fastly {};
fastly = callPackage ../misc/fastly {
# If buildGoModule is overriden, provide a matching version of the go attribute
};
f2 = callPackage ../tools/misc/f2 {};