diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template
index 922423f90b9..068a15ab3ae 100644
--- a/srcpkgs/retro-gtk/template
+++ b/srcpkgs/retro-gtk/template
@@ -1,12 +1,13 @@
 # Template file for 'retro-gtk'
 pkgname=retro-gtk
 version=0.16.0
-revision=1
+revision=2
 build_style=meson
+build_helper="gir"
 configure_args="$(vopt_bool gir introspection)"
-hostmakedepends="glib-devel pkg-config vala $(vopt_if gir gobject-introspection)"
+hostmakedepends="glib-devel pkg-config vala"
 makedepends="gtk+3-devel libepoxy-devel libglib-devel pulseaudio-devel"
-short_desc="The GTK+ Libretro frontend framework"
+short_desc="GTK+ Libretro frontend framework"
 maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/retro-gtk"
@@ -15,9 +16,11 @@ checksum=8c9b4ec9d6aa6b9db088a09706c0dd3de41437ff3a46f46566a47911efa7a627
 
 build_options="gir"
 
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" gir"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir" ;;
+esac
 
 retro-gtk-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
@@ -28,6 +31,7 @@ retro-gtk-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
+			vmove usr/share/vala
 		fi
 	}
 }