From 36223da9c1947297cf10b92682e7be60a97a33e3 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:38:59 +0200
Subject: [PATCH] buildGoModule: remove `buildFlags`/`buildFlagsArray`

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/build-support/go/module.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 3a3ae71de508..3b735dba266c 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -54,10 +54,6 @@
   # Go build flags.
 , GOFLAGS ? [ ]
 
-  # Needed for buildFlags{,Array} warning
-, buildFlags ? "" # deprecated
-, buildFlagsArray ? "" # deprecated
-
 , ...
 }@args':
 
@@ -213,8 +209,6 @@ in
     '');
 
     buildPhase = args.buildPhase or (
-      lib.warnIf (buildFlags != "" || buildFlagsArray != "")
-        "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
       lib.warnIf (builtins.elem "-buildid=" ldflags)
         "`-buildid=` is set by default as ldflag by buildGoModule"
     ''
@@ -232,12 +226,13 @@ in
       buildGoDir() {
         local cmd="$1" dir="$2"
 
-        declare -ga buildFlagsArray
         declare -a flags
-        flags+=($buildFlags "''${buildFlagsArray[@]}")
         flags+=(''${tags:+-tags=''${tags// /,}})
         flags+=(''${ldflags:+-ldflags="$ldflags"})
         flags+=("-p" "$NIX_BUILD_CORES")
+        if (( "''${NIX_DEBUG:-0}" >= 1 )); then
+          flags+=(-x)
+        fi
 
         if [ "$cmd" = "test" ]; then
           flags+=(-vet=off)
@@ -267,10 +262,6 @@ in
         fi
       }
 
-      if (( "''${NIX_DEBUG:-0}" >= 1 )); then
-        buildFlagsArray+=(-x)
-      fi
-
       if [ -z "$enableParallelBuilding" ]; then
           export NIX_BUILD_CORES=1
       fi