Skip to content

Commit

Permalink
glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook
Browse files Browse the repository at this point in the history
Since we split wrapGAppsHook and move its variable initialization to preFixupPhases in #81475, it was getting run before glibPreFixupPhase which sets GSETTINGS_SCHEMAS_PATH variable gappsWrapperArgsHook depends on. Let's introduce this ugly hack to ensure glibPreFixupPhase will run before gappsWrapperArgsHook.

(cherry picked from commit 8e4f502)
  • Loading branch information
jtojnar authored and worldofpeace committed Mar 4, 2020
1 parent da48691 commit e544e03
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion pkgs/development/libraries/glib/setup-hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,12 @@ glibPreFixupPhase() {

addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name"
}
preFixupPhases+=" glibPreFixupPhase"

# gappsWrapperArgsHook expects GSETTINGS_SCHEMAS_PATH variable to be set by this.
# Until we have dependency mechanism in generic builder, we need to use this ugly hack.
if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then
preFixupPhases+=" "
preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / glibPreFixupPhase gappsWrapperArgsHook }"
else
preFixupPhases+=" glibPreFixupPhase"
fi

0 comments on commit e544e03

Please sign in to comment.