~ruther/guix-local

ref: bd1aecf5fb0a07fb17b0ac63bd61cdf0dda20b03 guix-local/gnu/packages/patches/gtk-introspection-test.patch -rw-r--r-- 918 bytes
bd1aecf5 — Attila Lendvai gnu: Add rust-pbkdf2-0.7, rust-pbkdf2-0.6. 4 years ago
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
# 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)