From 5d14a3f126070396a3b750bd495aace3472861bd Mon Sep 17 00:00:00 2001
From: Claude Code <noreply@anthropic.com>
Date: Tue, 3 Feb 2026 11:20:21 +0000
Subject: [PATCH] buildDubPackage: fix flag arrays not being expanded correctly

Use concatTo to properly handle dubBuildFlags, dubTestFlags, and
dubFlags. Previously these were used as "${var[@]}" but Nix lists
become space-separated strings, not bash arrays, causing all flags
to be concatenated into a single argument.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../dlang/builddubpackage/hooks/dub-build-hook.sh        | 9 ++++++++-
 .../dlang/builddubpackage/hooks/dub-check-hook.sh        | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/dlang/builddubpackage/hooks/dub-build-hook.sh b/pkgs/build-support/dlang/builddubpackage/hooks/dub-build-hook.sh
index 400d7bcfc6329..78a7e75deaa61 100644
--- a/pkgs/build-support/dlang/builddubpackage/hooks/dub-build-hook.sh
+++ b/pkgs/build-support/dlang/builddubpackage/hooks/dub-build-hook.sh
@@ -2,7 +2,14 @@ dubBuildHook() {
     runHook preBuild
     echo "Executing dubBuildHook"
 
-    dub build --skip-registry=all --build="${dubBuildType-"release"}" "${dubBuildFlags[@]}" "${dubFlags[@]}"
+    local flagsArray=(
+        --skip-registry=all
+        "--build=${dubBuildType-release}"
+    )
+    concatTo flagsArray dubBuildFlags dubFlags
+
+    echoCmd 'dubBuildHook flags' "${flagsArray[@]}"
+    dub build "${flagsArray[@]}"
 
     echo "Finished dubBuildHook"
     runHook postBuild
diff --git a/pkgs/build-support/dlang/builddubpackage/hooks/dub-check-hook.sh b/pkgs/build-support/dlang/builddubpackage/hooks/dub-check-hook.sh
index 99ffd4ae1cb92..de6d7c0f7c326 100644
--- a/pkgs/build-support/dlang/builddubpackage/hooks/dub-check-hook.sh
+++ b/pkgs/build-support/dlang/builddubpackage/hooks/dub-check-hook.sh
@@ -2,7 +2,13 @@ dubCheckHook() {
     runHook preCheck
     echo "Executing dubCheckHook"
 
-    dub test --skip-registry=all "${dubTestFlags[@]}" "${dubFlags[@]}"
+    local flagsArray=(
+        --skip-registry=all
+    )
+    concatTo flagsArray dubTestFlags dubFlags
+
+    echoCmd 'dubCheckHook flags' "${flagsArray[@]}"
+    dub test "${flagsArray[@]}"
 
     echo "Finished dubCheckHook"
     runHook postCheck