zig: support structuredAttrs in setup hook

Tested waylock with and without __structuredAttrs.
NixOS · Aug 24, 2024 · 5564042 · 5564042
1 parent add9bca
commit 5564042
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 78 deletions.
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 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/`

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 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/`

diff --git a/pkgs/development/compilers/zig/0.12/setup-hook.sh b/pkgs/development/compilers/zig/0.12/setup-hook.sh
@@ -1,5 +1,6 @@
 # shellcheck shell=bash disable=SC2154,SC2086
 
+# 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/`

diff --git a/pkgs/development/compilers/zig/0.13/setup-hook.sh b/pkgs/development/compilers/zig/0.13/setup-hook.sh
@@ -1,5 +1,6 @@
 # shellcheck shell=bash disable=SC2154,SC2086
 
+# 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/`

diff --git a/pkgs/development/compilers/zig/0.9/setup-hook.sh b/pkgs/development/compilers/zig/0.9/setup-hook.sh
@@ -1,5 +1,6 @@
 # shellcheck shell=bash disable=SC2154,SC2086
 
+# 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/`

diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh
@@ -1,5 +1,6 @@
 # shellcheck shell=bash disable=SC2154,SC2086
 
+# 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/`