diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 540fbb8af0a..056d3a194a7 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,20 +1,20 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.36
-revision=1
+revision=2
 build_style=meson
+build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
  -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
  -Dpulse=disabled -Dgtk_doc=disabled"
-hostmakedepends="pkg-config $(vopt_if vala vala-devel) glib-devel
- spice-protocol $(vopt_if gir gobject-introspection) python3-six
- python3-parsing perl"
+hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
+ spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
- phodav-devel gstreamer1-devel gst-plugins-base1-devel $(vopt_if vala 'vala-devel')"
+ phodav-devel gstreamer1-devel gst-plugins-base1-devel"
 depends="hwids"
 short_desc="GTK+ SPICE widget"
 maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
@@ -26,9 +26,12 @@ checksum=7126c3584df12d40dcf4970f5f46fafd65b757620f911687e549f7da5c8fd7cd
 CFLAGS="-Wno-error"
 
 build_options="gir vala"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir vala"
-fi
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)