gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grafana: Fix cross

Browse Source 
```
go-1.25.4/share/go/pkg/tool/linux_amd64/link: running aarch64-unknown-linux-gnu-gcc failed: exit status 1
aarch64-unknown-linux-gnu-gcc -m64 -s -o $WORK/b001/exe/gen -rdynamic /build/go-link-507658645/go.o
aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option '-m64'
```

Above error happens because something `go generate` uses `$CC`
which is the for host compiler
https://www.github.com/golang/go/blob/b194f5d24a71e34f147c90e4351d80ac75be55de/src/cmd/cgo/gcc.go#L1763
https://www.github.com/golang/go/blob/b194f5d24a71e34f147c90e4351d80ac75be55de/src/cmd/cgo/gcc.go#L1724

`CGO_DISABLED=0` used to work to disable compiler usage but it does not
work anymore.
This commit is contained in:
Artturin
2025-12-01 02:29:51 +02:00
parent 388709dd59
commit 756865d780
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/monitoring/grafana/default.nix
+17 -7
View File
@@ -7,6 +7,8 @@
tzdata,
wire,
yarn-berry_4,
yarn-berry_4-fetcher,
buildPackages,
python3,
jq,
moreutils,
@@ -44,7 +46,8 @@ buildGoModule (finalAttrs: {
};
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
# Since this is not a dependency attribute the buildPackages has to be specified.
offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-CAEhdKsFMUuIs8DsJ9xSr2FRdBp4fPUWyvjC6FuiyG8=";
};
@@ -69,17 +72,19 @@ buildGoModule (finalAttrs: {
proxyVendor = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
wire
jq
moreutils
removeReferencesTo
# required to run old node-gyp
(python3.withPackages (ps: [ ps.distutils ]))
(python3.pythonOnBuildForHost.withPackages (ps: [ ps.distutils ]))
faketty
nodejs
yarn-berry_4
yarn-berry_4.yarnBerryConfigHook
yarn-berry_4-fetcher.yarnBerryConfigHook
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ];
@@ -88,7 +93,7 @@ buildGoModule (finalAttrs: {
overrideModAttrs = (
old: {
nativeBuildInputs = lib.filter (
x: lib.getName x != (lib.getName yarn-berry_4.yarnBerryConfigHook)
x: lib.getName x != (lib.getName buildPackages.yarn-berry_4-fetcher.yarnBerryConfigHook)
) old.nativeBuildInputs;
}
);
@@ -99,9 +104,14 @@ buildGoModule (finalAttrs: {
wire gen -tags oss ./pkg/server
wire gen -tags oss ./pkg/cmd/grafana-cli/runner
GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go
GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go
# ```
# go-1.25.4/share/go/pkg/tool/linux_amd64/link: running aarch64-unknown-linux-gnu-gcc failed: exit status 1
# aarch64-unknown-linux-gnu-gcc -m64 -s -o $WORK/b001/exe/gen -rdynamic /build/go-link-507658645/go.o
# aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option '-m64'
# ```
# Above log is due to https://github.com/golang/go/blob/b194f5d24a71e34f147c90e4351d80ac75be55de/src/cmd/cgo/gcc.go#L1763
CC="$CC_FOR_BUILD" LD="$CC_FOR_BUILD" GOOS= GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go
CC="$CC_FOR_BUILD" LD="$LD_FOR_BUILD" GOOS= GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go
'';
postBuild = ''