diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index ca41d2c8c0d..580d3ed5b8d 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -3,9 +3,10 @@ pkgname=gjs
 version=1.54.3
 revision=3
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--without-dbus-tests"
-hostmakedepends="glib-devel gobject-introspection intltool pkg-config"
-makedepends="dbus-glib-devel libgirepository-devel mozjs60-devel readline-devel"
+hostmakedepends="glib-devel intltool pkg-config"
+makedepends="dbus-glib-devel mozjs60-devel readline-devel"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, LGPL-2.0-or-later"
@@ -18,6 +19,22 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" --disable-profiler" # https://gitlab.gnome.org/GNOME/gjs/issues/132
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) ;;
+	*-musl) broken="gojbect-introspection" ;;
+esac
+
+post_configure() {
+	# Work around mozjs-60 pkg-config file having a -include directive
+	vsed -e "s|-include /usr/include|-include ${XBPS_CROSS_BASE}/usr/include|g" \
+		 -i Makefile
+
+	# Cross compilation gets this result wrong
+	vsed -e "s|^#define HAVE_DEBUG_SPIDERMONKEY.*|/* #undef HAVE_DEBUG_SPIDERMONKEY */|g" \
+		 -i config.h
+}
+
+
 do_check() {
 	# GJS's test try to use Cairo and GTK+ which need X
 	: