Merge pull request #86416 from jtojnar/gi-selfhook-fix

This commit is contained in:
Jan Tojnar 2020-04-30 22:42:36 +02:00 committed by GitHub
commit 083b0ba631
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -18,7 +18,14 @@ giDiscoverSelf() {
fi
}
preFixupHooks+=(giDiscoverSelf)
# gappsWrapperArgsHook expects GI_TYPELIB_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 / giDiscoverSelf gappsWrapperArgsHook }"
else
preFixupPhases+=" giDiscoverSelf"
fi
_multioutMoveGlibGir() {
moveToOutput share/gir-1.0 "${!outputDev}"