diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-30 22:42:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 22:42:36 +0200 |
| commit | 083b0ba631d56c3b60eb90ba2b81977e17704085 (patch) | |
| tree | 5948fa3023bd3e5ef1a3118c733b3185e71ed322 /pkgs | |
| parent | 06aa21f9899d3b5586df5653ed260e62276b2fc8 (diff) | |
| parent | 8f7387f2195da33dd0886a7b7dbcae0518725542 (diff) | |
| download | nixpkgs-083b0ba631d56c3b60eb90ba2b81977e17704085.tar nixpkgs-083b0ba631d56c3b60eb90ba2b81977e17704085.tar.gz nixpkgs-083b0ba631d56c3b60eb90ba2b81977e17704085.tar.bz2 nixpkgs-083b0ba631d56c3b60eb90ba2b81977e17704085.tar.lz nixpkgs-083b0ba631d56c3b60eb90ba2b81977e17704085.tar.xz nixpkgs-083b0ba631d56c3b60eb90ba2b81977e17704085.tar.zst nixpkgs-083b0ba631d56c3b60eb90ba2b81977e17704085.zip | |
Merge pull request #86416 from jtojnar/gi-selfhook-fix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gobject-introspection/setup-hook.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index a68d544cfbe..6bee47aeb09 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -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}" |