diff options
author | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-12-31 21:23:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-31 21:23:05 +0300 |
commit | d3e821156e278da1785e09ea0f38448e0637c091 (patch) | |
tree | 1ef7085de65afeef7c6162c14725940d190a6ee9 /pkgs/development/libraries | |
parent | a09a320e203d3e4fa7d5f74270fefe07dd882847 (diff) | |
parent | 0dff26daa4aa93397eaf1ef0407070efe9ecb8ad (diff) | |
download | nixpkgs-d3e821156e278da1785e09ea0f38448e0637c091.tar nixpkgs-d3e821156e278da1785e09ea0f38448e0637c091.tar.gz nixpkgs-d3e821156e278da1785e09ea0f38448e0637c091.tar.bz2 nixpkgs-d3e821156e278da1785e09ea0f38448e0637c091.tar.lz nixpkgs-d3e821156e278da1785e09ea0f38448e0637c091.tar.xz nixpkgs-d3e821156e278da1785e09ea0f38448e0637c091.tar.zst nixpkgs-d3e821156e278da1785e09ea0f38448e0637c091.zip |
Merge pull request #31094 from yegortimoshenko/ibus/update
ibus: 1.5.16 -> 1.5.17, fix
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/gobject-introspection/setup-hook.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 6d3488a6622..a79ce05a38d 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -1,5 +1,4 @@ make_gobject_introspection_find_gir_files() { - # required for .typelib files, eg mypaint git version if [ -d "$1/lib/girepository-1.0" ]; then addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0 @@ -13,9 +12,16 @@ make_gobject_introspection_find_gir_files() { addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files +giDiscoverSelf() { + if [ -d "$prefix/lib/girepository-1.0" ]; then + addToSearchPath GI_TYPELIB_PATH $prefix/lib/girepository-1.0 + fi +} + +preFixupHooks+=(giDiscoverSelf) + _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" } preFixupHooks+=(_multioutMoveGlibGir) - |