diff --git a/gpkg/gobject-introspection/build.sh b/gpkg/gobject-introspection/build.sh
index c8c1b06e7..89eb20ff2 100644
--- a/gpkg/gobject-introspection/build.sh
+++ b/gpkg/gobject-introspection/build.sh
@@ -13,5 +13,12 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 
 termux_step_pre_configure() {
+	TERMUX_PKG_VERSION=. termux_setup_gir
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -Dgi_cross_binary_wrapper=$GI_CROSS_LAUNCHER"
+	unset GI_CROSS_LAUNCHER
+	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
+		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -Dgi_cross_use_prebuilt_gi=true"
+	fi
+
 	CPPFLAGS+="-I$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION} -I$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}/cpython"
 }
diff --git a/gpkg/gobject-introspection/meson.build.patch b/gpkg/gobject-introspection/meson.build.patch
new file mode 100644
index 000000000..0ad97a045
--- /dev/null
+++ b/gpkg/gobject-introspection/meson.build.patch
@@ -0,0 +1,15 @@
+--- a/meson.build
++++ b/meson.build
+@@ -251,9 +249,9 @@
+ pkgconfig_variables = [
+   'datadir=' + '${prefix}' / get_option('datadir'),
+   'bindir=' + '${prefix}' / get_option('bindir'),
+-  'g_ir_scanner=${bindir}/g-ir-scanner',
+-  'g_ir_compiler=${bindir}/g-ir-compiler@0@'.format(exe_ext),
+-  'g_ir_generate=${bindir}/g-ir-generate@0@'.format(exe_ext),
++  'g_ir_scanner=g-ir-scanner',
++  'g_ir_compiler=g-ir-compiler@0@'.format(exe_ext),
++  'g_ir_generate=g-ir-generate@0@'.format(exe_ext),
+   'gidatadir=${datadir}/gobject-introspection-1.0',
+   'girdir=' + gir_dir_pc_prefix / 'gir-1.0',
+   'typelibdir=${libdir}/girepository-1.0',