# Extend rather than stomp environment variables.
# Upstream status: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4268
diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build
index 6202fb7446..b59191eb0f 100644
--- a/testsuite/introspection/meson.build
+++ b/testsuite/introspection/meson.build
@@ -1,9 +1,10 @@
+env = environment()
+env.prepend('GI_TYPELIB_PATH',
+    join_paths(project_build_root, 'gtk'),
+    gi_dep.get_pkgconfig_variable('typelibdir'))
+env.prepend('LD_PRELOAD', join_paths(project_build_root, 'gtk', 'libgtk-4.so'))
 
 test('api',
      find_program('api.py', dirs: meson.current_source_dir()),
      suite: ['introspection'],
-     env: [
-       'GI_TYPELIB_PATH=@0@/gtk:@1@'.format(project_build_root,
-          gi_dep.get_pkgconfig_variable('typelibdir')),
-       'LD_PRELOAD=@0@/gtk/libgtk-4.so'.format(project_build_root),
-     ])
+     env: env)
lass='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=e8bded2de72c17317d7799b699a724086f92ed7b'>refs</a><a class='active' href='/guix/log/tests/import-github.scm'>log</a><a href='/guix/tree/tests/import-github.scm?id=e8bded2de72c17317d7799b699a724086f92ed7b'>tree</a><a href='/guix/commit/tests/import-github.scm?id=e8bded2de72c17317d7799b699a724086f92ed7b'>commit</a><a href='/guix/diff/tests/import-github.scm?id=e8bded2de72c17317d7799b699a724086f92ed7b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/import-github.scm'>
<input type='hidden' name='id' value='e8bded2de72c17317d7799b699a724086f92ed7b'/><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=e8bded2de72c17317d7799b699a724086f92ed7b'>root</a>/<a href='/guix/log/tests?id=e8bded2de72c17317d7799b699a724086f92ed7b'>tests</a>/<a href='/guix/log/tests/import-github.scm?id=e8bded2de72c17317d7799b699a724086f92ed7b'>import-github.scm</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/import-github.scm?id=e8bded2de72c17317d7799b699a724086f92ed7b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-03-07 22:49:27 +0100'>2022-03-07</span></td><td><a href='/guix/commit/tests/import-github.scm?id=667f21aea000b988f2587f9039be25e61a2cbb08'>tests: Adjust to (guix import github) changes.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to a8d3033da61958c53c44dd5db90672bfc4533ef9.

* tests/import-github.scm (call-with-releases): Mock
'open-connection-for-uri'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-16 23:56:56 +0100'>2022-01-16</span></td><td><a href='/guix/commit/tests/import-github.scm?id=81f036bfd23fb6e0f381ced2de27762fa9d1bb65'>import/github: Test it.</a><span class='msg-avail'>...<span class='msg-tooltip'>* Makefile.am (SCM_TESTS): Register new tests.
* guix/import/github.scm
  (%github-api): New variable.
  (fetch-releases-or-tags): Use the new variable.
* tests/import-github.scm: New file with tests.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxime Devos</td></tr>