From 349a55616fc5218a8485cde485763cc49de4c3d2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 25 May 2026 14:21:23 +0200 Subject: [PATCH] vg: move NIX_CFLAGS_COMPILE into env for consistency The rest of nixpkgs (minus some stragglers) has had this moved into env. This commit does actually cause a rebuild since structuredAttrs is already enabled. --- pkgs/by-name/vg/vg/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/vg/vg/package.nix b/pkgs/by-name/vg/vg/package.nix index 816af95965f1..8a698ab71403 100644 --- a/pkgs/by-name/vg/vg/package.nix +++ b/pkgs/by-name/vg/vg/package.nix @@ -128,14 +128,15 @@ stdenv.mkDerivation (finalAttrs: { ] ); - # needed, else build fails - env.VG_GIT_VERSION = finalAttrs.src.tag; - - # deps/elfutils - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=stringop-overflow" - "-Wno-error=unterminated-string-initialization" - ]; + env = { + # needed, else build fails + VG_GIT_VERSION = finalAttrs.src.tag; + # deps/elfutils + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=stringop-overflow" + "-Wno-error=unterminated-string-initialization" + ]; + }; makeFlags = [ # don't build statically