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

Merge pull request #81759 from jtojnar/gio-wgah-order-hack

Browse Source 
glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook
This commit is contained in:
worldofpeace 2020-03-04 22:38:17 +00:00 committed by GitHub
commit 0d877fbb29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,4 +24,12 @@ glibPreFixupPhase() {
addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" 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