diff --git a/srcpkgs/libdazzle/patches/fix-cross-gir.patch b/srcpkgs/libdazzle/patches/fix-cross-gir.patch
new file mode 100644
index 00000000000..b3a10b29f84
--- /dev/null
+++ b/srcpkgs/libdazzle/patches/fix-cross-gir.patch
@@ -0,0 +1,14 @@
+diff --git a/src/meson.build b/src/meson.build
+index 6ff8a6a..f0b2887 100644
+--- src/meson.build
++++ src/meson.build
+@@ -132,7 +132,7 @@ if get_option('with_introspection')
+         install_dir_gir: girdir,
+     install_dir_typelib: typelibdir,
+         export_packages: libdazzle_package,
+-             extra_args: [ '--c-include=dazzle.h', '--quiet' ],
++             extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION', ],
+   )
+ 
+   if get_option('with_vapi')
+
diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 043c90a23e2..74a8a530f96 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,14 +1,15 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
 version=3.30.2
-revision=1
+revision=2
 build_style=meson
-configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false)
+build_helper="gir"
+configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if vala true false)
  -Dwith_introspection=$(vopt_if gir true false)"
 hostmakedepends="glib-devel pkg-config
- $(vopt_if gir 'gobject-introspection vala')"
+ $(vopt_if vala 'vala')"
 makedepends="gtk+3-devel libglib-devel"
-short_desc="A library to delight your users with fancy features"
+short_desc="Library to delight your users with fancy features"
 maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
@@ -16,10 +17,13 @@ changelog="https://raw.githubusercontent.com/GNOME/libdazzle/libdazzle-3-30/NEWS
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
 checksum=78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5
 
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" gir"
-fi
+build_options="gir vala"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir" ;;
+esac
 
 do_check() {
 	# Needs X
@@ -35,6 +39,8 @@ libdazzle-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}