--- a/girepository/gitypelib.c.orig
+++ b/girepository/gitypelib.c
@@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib)
         {
           GModule *module;
 
+          /* 'gobject-introspection' doesn't store the path of shared
+             libraries into '.typelib' and '.gir' files.  Shared
+             libraries are searched for in the dynamic linker search
+             path.  In Guix we patch 'gobject-introspection' such that
+             it stores the absolute path of shared libraries in
+             '.typelib' and '.gir' files.  Here, in order to minimize
+             side effects, we make sure that if the library is not
+             found at the indicated path location, we try with just
+             the basename and the system dynamic library
+             infrastructure, as per default behaviour of the
+             library. */
           module = load_one_shared_library (shlibs[i]);
+          if (module == NULL && g_path_is_absolute (shlibs[i]))
+            {
+              module = load_one_shared_library (g_basename(shlibs[i]));
+            }
 
           if (module == NULL)
             {
ref='/guix/log/tests/civodul.key'>log</a><a href='/guix/tree/tests/civodul.key?id=9d48a179d19ffa32c3255bbc5c573afad0b2cc3a'>tree</a><a href='/guix/commit/tests/civodul.key?id=9d48a179d19ffa32c3255bbc5c573afad0b2cc3a'>commit</a><a href='/guix/diff/tests/civodul.key?id=9d48a179d19ffa32c3255bbc5c573afad0b2cc3a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/civodul.key'>
<input type='hidden' name='id' value='9d48a179d19ffa32c3255bbc5c573afad0b2cc3a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9d48a179d19ffa32c3255bbc5c573afad0b2cc3a'>root</a>/<a href='/guix/log/tests?id=9d48a179d19ffa32c3255bbc5c573afad0b2cc3a'>tests</a>/<a href='/guix/log/tests/civodul.key?id=9d48a179d19ffa32c3255bbc5c573afad0b2cc3a'>civodul.key</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/civodul.key?id=9d48a179d19ffa32c3255bbc5c573afad0b2cc3a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/civodul.key?id=43408e304ffb1149f35cb539b40d673d567c9116'>Add (guix openpgp).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/openpgp.scm, tests/openpgp.scm, tests/civodul.key,
tests/dsa.key, tests/ed25519.key, tests/rsa.key,
tests/ed25519.sec: New files.
* Makefile.am (MODULES): Add guix/openpgp.scm.
(SCM_TESTS): Add tests/openpgp.scm.
(EXTRA_DIST): Add tests/*.key and tests/ed25519.sec.
</span></span></td><td>Ludovic Courtès</td></tr>