diff --git a/srcpkgs/libgit2-glib/patches/fix-gir-cross.patch b/srcpkgs/libgit2-glib/patches/fix-gir-cross.patch
new file mode 100644
index 00000000000..13bea203bcb
--- /dev/null
+++ b/srcpkgs/libgit2-glib/patches/fix-gir-cross.patch
@@ -0,0 +1,14 @@
+diff --git a/meson.build b/meson.build
+index e1e9fde..63b958a 100644
+--- meson.build
++++ meson.build
+@@ -124,7 +124,7 @@ libgit2_dep = dependency('libgit2', version: '>=' + git2_req)
+ enable_gir = get_option('introspection')
+ if enable_gir
+   # XXX: Not nice, but probably our best option
+-  enable_gir = find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build()
++  enable_gir = find_program('g-ir-scanner', required: false).found()
+ endif
+ 
+ enable_vapi = get_option('vapi')
+
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 2f493270519..1852884878c 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -3,11 +3,11 @@ pkgname=libgit2-glib
 version=0.27.7
 revision=1
 build_style=meson
+build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vapi true false)"
-hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libgit2-devel python-gobject-devel
- $(vopt_if gir gobject-introspection) $(vopt_if vapi vala-devel)"
+ -Dvapi=$(vopt_if vala true false)"
+hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
+makedepends="libglib-devel libgit2-devel python-gobject-devel"
 short_desc="Glib wrapper library around libgit2"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -15,10 +15,13 @@ homepage="https://github.com/GNOME/${pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=224a0bc1d902729b42ca9424db545c460ff8aaeb08addc2b0a01bf235b4c9d6e
 
-build_options="gir vapi"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir vapi"
-fi
+build_options="gir vala"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 libgit2-glib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libglib-devel libgit2-devel"
@@ -27,7 +30,9 @@ libgit2-glib-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/vala
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi