treewide: support structuredAttrs in setup hooks (part 2) (#335666)

NixOS · Aug 28, 2024 · 0d1b268 · 0d1b268
2 parents db8f276 + 581aebc
commit 0d1b268
Show file tree

Hide file tree

Showing 21 changed files with 197 additions and 217 deletions.
diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh
@@ -4,8 +4,11 @@ autoreconfPhase() {
     runHook preAutoreconf
 
     local flagsArray=()
-    : "${autoreconfFlags:=--install --force --verbose}"
-    concatTo flagsArray autoreconfFlags
+    if [[ -v autoreconfFlags ]]; then
+        concatTo flagsArray autoreconfFlags
+    else
+        flagsArray+=(--install --force --verbose)
+    fi
 
     autoreconf "${flagsArray[@]}"
     runHook postAutoreconf

diff --git a/pkgs/by-name/bm/bmake/setup-hook.sh b/pkgs/by-name/bm/bmake/setup-hook.sh
@@ -14,9 +14,8 @@ bmakeBuildPhase() {
     local flagsArray=(
         ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
         SHELL="$SHELL"
-        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-        $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
     )
+    concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
 
     echoCmd 'build flags' "${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -42,11 +41,8 @@ bmakeCheckPhase() {
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
             SHELL="$SHELL"
-            # Old bash empty array hack
-            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-            ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
-            ${checkTarget}
         )
+        concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget
 
         echoCmd 'check flags' "${flagsArray[@]}"
         bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -65,11 +61,8 @@ bmakeInstallPhase() {
     local flagsArray=(
         ${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
         SHELL="$SHELL"
-        # Old bash empty array hack
-        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-        $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
-        ${installTargets:-install}
     )
+    concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install
 
     echoCmd 'install flags' "${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -84,10 +77,8 @@ bmakeDistPhase() {
         mkdir -p "$prefix"
     fi
 
-    # Old bash empty array hack
-    local flagsArray=(
-        $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
-    )
+    local flagsArray=()
+    concatTo flagsArray distFlags distFlagsArray distTarget=dist
 
     echo 'dist flags: %q' "${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"

diff --git a/pkgs/by-name/ju/just/setup-hook.sh b/pkgs/by-name/ju/just/setup-hook.sh
@@ -1,7 +1,10 @@
+# shellcheck shell=bash
+
 justBuildPhase() {
     runHook preBuild
 
-    local flagsArray=($justFlags "${justFlagsArray[@]}")
+    local flagsArray=()
+    concatTo flagsArray justFlags justFlagsArray
 
     echoCmd 'build flags' "${flagsArray[@]}"
     just "${flagsArray[@]}"
@@ -14,17 +17,15 @@ justCheckPhase() {
 
     if [ -z "${checkTarget:-}" ]; then
         if just -n test >/dev/null 2>&1; then
-            checkTarget=test
+            checkTarget="test"
         fi
     fi
 
     if [ -z "${checkTarget:-}" ]; then
         echo "no test target found in just, doing nothing"
     else
-        local flagsArray=(
-            $justFlags "${justFlagsArray[@]}"
-            $checkTarget
-        )
+        local flagsArray=()
+        concatTo flagsArray justFlags justFlagsArray checkTarget
 
         echoCmd 'check flags' "${flagsArray[@]}"
         just "${flagsArray[@]}"
@@ -36,23 +37,23 @@ justCheckPhase() {
 justInstallPhase() {
     runHook preInstall
 
-    # shellcheck disable=SC2086
-    local flagsArray=($justFlags "${justFlagsArray[@]}" ${installTargets:-install})
+    local flagsArray=()
+    concatTo flagsArray justFlags justFlagsArray installTargets=install
 
     echoCmd 'install flags' "${flagsArray[@]}"
     just "${flagsArray[@]}"
 
     runHook postInstall
 }
 
-if [ -z "${dontUseJustBuild-}" -a -z "${buildPhase-}" ]; then
+if [ -z "${dontUseJustBuild-}" ] && [ -z "${buildPhase-}" ]; then
     buildPhase=justBuildPhase
 fi
 
-if [ -z "${dontUseJustCheck-}" -a -z "${checkPhase-}" ]; then
+if [ -z "${dontUseJustCheck-}" ] && [ -z "${checkPhase-}" ]; then
     checkPhase=justCheckPhase
 fi
 
-if [ -z "${dontUseJustInstall-}" -a -z "${installPhase-}" ]; then
+if [ -z "${dontUseJustInstall-}" ] && [ -z "${installPhase-}" ]; then
     installPhase=justInstallPhase
 fi
diff --git a/pkgs/by-name/ni/ninja/setup-hook.sh b/pkgs/by-name/ni/ninja/setup-hook.sh
@@ -65,8 +65,7 @@ ninjaInstallPhase() {
     local flagsArray=(
         "-j$buildCores"
     )
-    : "${installTargets:=install}"
-    concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets
+    concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets=install
 
     echoCmd 'install flags' "${flagsArray[@]}"
     TERM=dumb ninja "${flagsArray[@]}"

diff --git a/pkgs/by-name/sc/scons/setup-hook.sh b/pkgs/by-name/sc/scons/setup-hook.sh
@@ -8,14 +8,13 @@ sconsBuildPhase() {
     fi
 
     if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then
-        buildFlags="${prefixKey:-prefix=}$prefix $buildFlags"
+        prependToVar buildFlags "${prefixKey:-prefix=}$prefix"
     fi
 
     local flagsArray=(
       ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
-      $sconsFlags ${sconsFlagsArray[@]}
-      $buildFlags ${buildFlagsArray[@]}
     )
+    concatTo flagsArray sconsFlags sconsFlagsArray buildFlags buildFlagsArray
 
     echoCmd 'scons build flags' "${flagsArray[@]}"
     scons "${flagsArray[@]}"
@@ -31,15 +30,13 @@ sconsInstallPhase() {
     fi
 
     if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then
-        installFlags="${prefixKey:-prefix=}$prefix $installFlags"
+        prependToVar installFlags "${prefixKey:-prefix=}$prefix"
     fi
 
     local flagsArray=(
         ${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
-        $sconsFlags ${sconsFlagsArray[@]}
-        $installFlags ${installFlagsArray[@]}
-        ${installTargets:-install}
     )
+    concatTo flagsArray sconsFlags sconsFlagsArray installFlags installFlagsArray installTargets=install
 
     echoCmd 'scons install flags' "${flagsArray[@]}"
     scons "${flagsArray[@]}"
@@ -63,9 +60,8 @@ sconsCheckPhase() {
     else
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
-            $sconsFlags ${sconsFlagsArray[@]}
-            ${checkFlagsArray[@]}
         )
+        concatTo flagsArray sconsFlags sconsFlagsArray checkFlagsArray checkTarget
 
         echoCmd 'scons check flags' "${flagsArray[@]}"
         scons "${flagsArray[@]}"

diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh
@@ -16,11 +16,8 @@ wafConfigurePhase() {
       export PKGCONFIG="${PKG_CONFIG}"
     fi
 
-    local flagsArray=(
-        $prefixFlag
-        $wafConfigureFlags "${wafConfigureFlagsArray[@]}"
-        ${wafConfigureTargets:-configure}
-    )
+    local flagsArray=( $prefixFlag )
+    concatTo flagsArray wafConfigureFlags wafConfigureFlagsArray wafConfigureTargets=configure
 
     echoCmd 'waf configure flags' "${flagsArray[@]}"
     python "$wafPath" "${flagsArray[@]}"
@@ -41,15 +38,8 @@ wafConfigurePhase() {
 wafBuildPhase () {
     runHook preBuild
 
-    # set to empty if unset
-    : "${wafFlags=}"
-
-    local flagsArray=(
-      ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}}
-      $wafFlags ${wafFlagsArray[@]}
-      $wafBuildFlags ${wafBuildFlagsArray[@]}
-      ${wafBuildTargets:-build}
-    )
+    local flagsArray=( ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} )
+    concatTo flagsArray wafFlags wafFlagsArray wafBuildFlags wafBuildFlagsArray wafBuildTargets=build
 
     echoCmd 'waf build flags' "${flagsArray[@]}"
     python "$wafPath" "${flagsArray[@]}"
@@ -64,12 +54,8 @@ wafInstallPhase() {
         mkdir -p "$prefix"
     fi
 
-    local flagsArray=(
-        ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}}
-        $wafFlags ${wafFlagsArray[@]}
-        $wafInstallFlags ${wafInstallFlagsArray[@]}
-        ${wafInstallTargets:-install}
-    )
+    local flagsArray=( ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} )
+    concatTo flagsArray wafFlags wafFlagsArray wafInstallFlags wafInstallFlagsArray wafInstallTargets=install
 
     echoCmd 'waf install flags' "${flagsArray[@]}"
     python "$wafPath" "${flagsArray[@]}"

diff --git a/pkgs/development/compilers/zig/0.10/setup-hook.sh b/pkgs/development/compilers/zig/0.10/setup-hook.sh
@@ -1,5 +1,6 @@
-# shellcheck shell=bash disable=SC2154,SC2086
+# shellcheck shell=bash
 
+# shellcheck disable=SC2034
 readonly zigDefaultFlagsArray=(@zig_default_flags@)
 
 function zigSetGlobalCacheDir {
@@ -10,10 +11,9 @@ function zigSetGlobalCacheDir {
 function zigBuildPhase {
     runHook preBuild
 
-    local flagsArray=(
-        "${zigDefaultFlagsArray[@]}"
-        $zigBuildFlags "${zigBuildFlagsArray[@]}"
-    )
+    local flagsArray=()
+    concatTo flagsArray zigDefaultFlagsArray \
+        zigBuildFlags zigBuildFlagsArray
 
     echoCmd 'zig build flags' "${flagsArray[@]}"
     zig build "${flagsArray[@]}"
@@ -24,10 +24,9 @@ function zigBuildPhase {
 function zigCheckPhase {
     runHook preCheck
 
-    local flagsArray=(
-        "${zigDefaultFlagsArray[@]}"
-        $zigCheckFlags "${zigCheckFlagsArray[@]}"
-    )
+    local flagsArray=()
+    concatTo flagsArray zigDefaultFlagsArray \
+        zigCheckFlags zigCheckFlagsArray
 
     echoCmd 'zig check flags' "${flagsArray[@]}"
     zig build test "${flagsArray[@]}"
@@ -38,11 +37,10 @@ function zigCheckPhase {
 function zigInstallPhase {
     runHook preInstall
 
-    local flagsArray=(
-        "${zigDefaultFlagsArray[@]}"
-        $zigBuildFlags "${zigBuildFlagsArray[@]}"
-        $zigInstallFlags "${zigInstallFlagsArray[@]}"
-    )
+    local flagsArray=()
+    concatTo flagsArray zigDefaultFlagsArray \
+        zigBuildFlags zigBuildFlagsArray \
+        zigInstallFlags zigInstallFlagsArray
 
     if [ -z "${dontAddPrefix-}" ]; then
         # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
@@ -55,6 +53,7 @@ function zigInstallPhase {
     runHook postInstall
 }
 
+# shellcheck disable=SC2154
 addEnvHooks "$targetOffset" zigSetGlobalCacheDir
 
 if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then

diff --git a/pkgs/development/compilers/zig/0.11/setup-hook.sh b/pkgs/development/compilers/zig/0.11/setup-hook.sh
@@ -1,5 +1,6 @@
-# shellcheck shell=bash disable=SC2154,SC2086
+# shellcheck shell=bash
 
+# shellcheck disable=SC2034
 readonly zigDefaultFlagsArray=(@zig_default_flags@)
 
 function zigSetGlobalCacheDir {
@@ -10,10 +11,9 @@ function zigSetGlobalCacheDir {
 function zigBuildPhase {
     runHook preBuild
 
-    local flagsArray=(
-        "${zigDefaultFlagsArray[@]}"
-        $zigBuildFlags "${zigBuildFlagsArray[@]}"
-    )
+    local flagsArray=()
+    concatTo flagsArray zigDefaultFlagsArray \
+        zigBuildFlags zigBuildFlagsArray
 
     echoCmd 'zig build flags' "${flagsArray[@]}"
     zig build "${flagsArray[@]}"
@@ -24,10 +24,9 @@ function zigBuildPhase {
 function zigCheckPhase {
     runHook preCheck
 
-    local flagsArray=(
-        "${zigDefaultFlagsArray[@]}"
-        $zigCheckFlags "${zigCheckFlagsArray[@]}"
-    )
+    local flagsArray=()
+    concatTo flagsArray zigDefaultFlagsArray \
+        zigCheckFlags zigCheckFlagsArray
 
     echoCmd 'zig check flags' "${flagsArray[@]}"
     zig build test "${flagsArray[@]}"
@@ -38,11 +37,10 @@ function zigCheckPhase {
 function zigInstallPhase {
     runHook preInstall
 
-    local flagsArray=(
-        "${zigDefaultFlagsArray[@]}"
-        $zigBuildFlags "${zigBuildFlagsArray[@]}"
-        $zigInstallFlags "${zigInstallFlagsArray[@]}"
-    )
+    local flagsArray=()
+    concatTo flagsArray zigDefaultFlagsArray \
+        zigBuildFlags zigBuildFlagsArray \
+        zigInstallFlags zigInstallFlagsArray
 
     if [ -z "${dontAddPrefix-}" ]; then
         # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
@@ -55,6 +53,7 @@ function zigInstallPhase {
     runHook postInstall
 }
 
+# shellcheck disable=SC2154
 addEnvHooks "$targetOffset" zigSetGlobalCacheDir
 
 if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then