dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

scons: support structuredAttrs in setup hook

Browse Source 
Tested swiften with and without __structuredAttrs.
This commit is contained in:
Wolfgang Walther 2024-06-09 19:06:44 +02:00
parent b42b649581
commit 4a48b9242c
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/by-name/sc/scons/setup-hook.sh
View File

@ -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
echoCmd 'scons check flags' "${flagsArray[@]}"
scons "${flagsArray[@]}"