From 507c5e3beccbf01063bac040c97cd12036e1183a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 30 Jan 2026 23:01:57 +0100 Subject: [PATCH] grafana-alloy: move NIX_CFLAGS_COMPILE and others into env for structuredAttrs Also split checkFlags for structuredAttrs --- pkgs/by-name/gr/grafana-alloy/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index b2b3f4a553a5..d380045183f0 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -55,7 +55,15 @@ buildGoModule (finalAttrs: rec { ] ++ lib.optionals useLLD [ lld ]; - env = lib.optionalAttrs useLLD { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; + env = + lib.optionalAttrs useLLD { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + } + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) { + # uses go-systemd, which uses libsystemd headers + # https://github.com/coreos/go-systemd/issues/351 + NIX_CFLAGS_COMPILE = "-I${lib.getDev systemd}/include"; + }; ldflags = let @@ -87,15 +95,11 @@ buildGoModule (finalAttrs: rec { "." ]; - # uses go-systemd, which uses libsystemd headers - # https://github.com/coreos/go-systemd/issues/351 - NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isLinux [ - "-I${lib.getDev systemd}/include" - ]; - checkFlags = [ - "-tags nonetwork" # disable network tests - "-tags nodocker" # disable docker tests + "-tags" + "nonetwork" # disable network tests + "-tags" + "nodocker" # disable docker tests ]; # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at