qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: handle preInstallPhases __structuredAttrs-agnostically

Browse Source 
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:
Yueh-Shun Li 2024-09-03 04:14:28 +08:00
parent 5d42a8b38c
commit 385d523a8e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnustep/make/setup-hook.sh
View File

@ -18,7 +18,7 @@ addGnustepInstallFlags() {
) )
} }
preInstallPhases+=" addGnustepInstallFlags" appendToVar preInstallPhases addGnustepInstallFlags
addGNUstepEnvVars() { addGNUstepEnvVars() {
local filename local filename

2
pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh
View File

@ -16,5 +16,5 @@ pythonRuntimeDepsCheckHook() {
if [ -z "${dontCheckRuntimeDeps-}" ]; then if [ -z "${dontCheckRuntimeDeps-}" ]; then
echo "Using pythonRuntimeDepsCheckHook" echo "Using pythonRuntimeDepsCheckHook"
preInstallPhases+=" pythonRuntimeDepsCheckHook" appendToVar preInstallPhases pythonRuntimeDepsCheckHook
fi fi

2
pkgs/development/libraries/glib/setup-hook.sh
View File

@ -12,7 +12,7 @@ addEnvHooks "$targetOffset" make_glib_find_gsettings_schemas
glibPreInstallPhase() { glibPreInstallPhase() {
makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/") makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
} }
preInstallPhases+=" glibPreInstallPhase" appendToVar preInstallPhases glibPreInstallPhase
glibPreFixupPhase() { glibPreFixupPhase() {
# Move gschemas in case the install flag didn't help # Move gschemas in case the install flag didn't help