mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 11:23:29 +00:00
just: support structuredAttrs in setup hook
Tested cosmic-applibrary with and without __structuredAttrs.
This commit is contained in:
parent
f96e20895f
commit
c3900d12c9
@ -1,7 +1,8 @@
|
||||
justBuildPhase() {
|
||||
runHook preBuild
|
||||
|
||||
local flagsArray=($justFlags "${justFlagsArray[@]}")
|
||||
local flagsArray=()
|
||||
concatTo flagsArray justFlags justFlagsArray
|
||||
|
||||
echoCmd 'build flags' "${flagsArray[@]}"
|
||||
just "${flagsArray[@]}"
|
||||
@ -21,10 +22,8 @@ justCheckPhase() {
|
||||
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,8 +35,8 @@ 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[@]}"
|
||||
|
Loading…
Reference in New Issue
Block a user