mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
treewide: handle preInstallPhases __structuredAttrs-agnostically
Always specify the preInstallPhases attribute as a list instead of a string. Append elements to the preInstallPhases Bash variable using appendToVar instead of string or Bash array concatenation.
This commit is contained in:
parent
5d42a8b38c
commit
385d523a8e
@ -18,7 +18,7 @@ addGnustepInstallFlags() {
|
||||
)
|
||||
}
|
||||
|
||||
preInstallPhases+=" addGnustepInstallFlags"
|
||||
appendToVar preInstallPhases addGnustepInstallFlags
|
||||
|
||||
addGNUstepEnvVars() {
|
||||
local filename
|
||||
|
@ -16,5 +16,5 @@ pythonRuntimeDepsCheckHook() {
|
||||
|
||||
if [ -z "${dontCheckRuntimeDeps-}" ]; then
|
||||
echo "Using pythonRuntimeDepsCheckHook"
|
||||
preInstallPhases+=" pythonRuntimeDepsCheckHook"
|
||||
appendToVar preInstallPhases pythonRuntimeDepsCheckHook
|
||||
fi
|
||||
|
@ -12,7 +12,7 @@ addEnvHooks "$targetOffset" make_glib_find_gsettings_schemas
|
||||
glibPreInstallPhase() {
|
||||
makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
|
||||
}
|
||||
preInstallPhases+=" glibPreInstallPhase"
|
||||
appendToVar preInstallPhases glibPreInstallPhase
|
||||
|
||||
glibPreFixupPhase() {
|
||||
# Move gschemas in case the install flag didn't help
|
||||
|
Loading…
Reference in New Issue
Block a user