diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
index 21ecbd0c698..26dbba09c67 100644
--- a/srcpkgs/clutter/template
+++ b/srcpkgs/clutter/template
@@ -1,13 +1,14 @@
 # Template file for 'clutter'
 pkgname=clutter
 version=1.26.2
-revision=3
+revision=4
 build_style=gnu-configure
+build_helper="gir"
 configure_args="$(vopt_enable gir introspection) --enable-evdev --enable-evdev-input
  --enable-wayland-backend --enable-egl-backend --enable-wayland-compositor
  --enable-gdk-backend"
 hostmakedepends="automake libtool pkg-config intltool glib-devel
- gettext-devel $(vopt_if gir gobject-introspection)"
+ gettext-devel"
 makedepends="atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel
  libgudev-devel libxkbcommon-devel cogl-devel libinput-devel libevdev-devel
  eudev-libudev-devel gtk+3-devel"
@@ -19,9 +20,12 @@ distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz"
 checksum=e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56
 
 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
 
 pre_configure() {
 	autoreconf -fi