From b9efad374e98cde9114f1054f0d97055b036091e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 28 Nov 2024 01:39:02 +0800
Subject: [PATCH 1/2] buildGoModule: handle ldflags and tags
 __structuredAttrs-agnostically

---
 pkgs/build-support/go/module.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 4ef0bcc9db21..4bd7b2693bd0 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -222,8 +222,8 @@ in
         local cmd="$1" dir="$2"
 
         declare -a flags
-        flags+=(''${tags:+-tags=''${tags// /,}})
-        flags+=(''${ldflags:+-ldflags="$ldflags"})
+        flags+=(''${tags:+-tags=$(concatStringsSep "," tags)})
+        flags+=(''${ldflags:+-ldflags="''${ldflags[*]}"})
         flags+=("-p" "$NIX_BUILD_CORES")
         if (( "''${NIX_DEBUG:-0}" >= 1 )); then
           flags+=(-x)

From 22c6ae979e4040218af23c31efb84940e72b46d6 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 28 Nov 2024 02:12:45 +0800
Subject: [PATCH 2/2] buildGoModule: Use environment variable GOOS and GOARCH
 directly

---
 pkgs/build-support/go/module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 4bd7b2693bd0..a506acabdd26 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -267,7 +267,7 @@ in
     '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
       # normalize cross-compiled builds w.r.t. native builds
       (
-        dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH}
+        dir=$GOPATH/bin/''${GOOS}_''${GOARCH}
         if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
           mv $dir/* $dir/..
         fi