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

gobject-introspection: Ensure the giDiscoverSelf is run before gappsWrapperArgsHook 

gappsWrapperArgsHook tries to collect GI_TYPELIB_PATH environment variable so if we want it to see the path giDiscoverSelf adds, we need to force the order.
This commit is contained in:
Jan Tojnar 2020-04-30 20:12:30 +02:00
parent 7c399a4ee0
commit 8f7387f219
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gobject-introspection/setup-hook.sh
View File

@ -18,7 +18,14 @@ giDiscoverSelf() {
fi 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() { _multioutMoveGlibGir() {
moveToOutput share/gir-1.0 "${!outputDev}" moveToOutput share/gir-1.0 "${!outputDev}"