From 202bfa48fd04d3714345e8ed90a33f82befdaf62 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 21:40:05 +0200
Subject: [PATCH] freebsd: support structuredAttrs in setup hook

Couldn't test this, because freebsd.compat is failing with unrelated
errors for me.
---
 .../pkgs/freebsdSetupHook/setup-hook.sh       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh b/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh
index 96a3d14c80f7..ac6e9c12229a 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh
@@ -1,22 +1,22 @@
 setFreeBSDSrcTop() {
-  makeFlags="SRCTOP=$BSDSRCDIR $makeFlags"
+  prependToVar makeFlags "SRCTOP=$BSDSRCDIR"
 }
 
 addFreeBSDMakeFlags() {
-  makeFlags="SBINDIR=${!outputBin}/bin $makeFlags"
-  makeFlags="LIBEXECDIR=${!outputLib}/libexec $makeFlags"
-  makeFlags="LIBDATADIR=${!outputLib}/data $makeFlags"
-  makeFlags="INCLUDEDIR=${!outputDev}/include $makeFlags"
-  makeFlags="CONFDIR=${!outputBin}/etc $makeFlags"
-  makeFlags="MANDIR=${!outputMan}/share/man/man $makeFlags"
+  prependToVar makeFlags "SBINDIR=${!outputBin}/bin"
+  prependToVar makeFlags "LIBEXECDIR=${!outputLib}/libexec"
+  prependToVar makeFlags "LIBDATADIR=${!outputLib}/data"
+  prependToVar makeFlags "INCLUDEDIR=${!outputDev}/include"
+  prependToVar makeFlags "CONFDIR=${!outputBin}/etc"
+  prependToVar makeFlags "MANDIR=${!outputMan}/share/man/man"
 
   if [ -n "$debug" ]; then
-    makeFlags="DEBUGFILEDIR=${debug}/lib/debug $makeFlags"
+    prependToVar makeFlags "DEBUGFILEDIR=${debug}/lib/debug"
   else
-    makeFlags="DEBUGFILEDIR=${out}/lib/debug $makeFlags"
+    prependToVar makeFlags "DEBUGFILEDIR=${out}/lib/debug"
   fi
 
-  echo $makeFlags
+  echoCmd 'FreeBSD makeFlags' "${makeFlags[@]}"
 }
 
 postUnpackHooks+=(setFreeBSDSrcTop)