diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
new file mode 100644
index 00000000000..4685b98184d
--- /dev/null
+++ b/srcpkgs/libgxps/patches/fix-gir-cross.patch
@@ -0,0 +1,14 @@
+diff --git a/meson.build b/meson.build
+index a34a616..2d6eb1e 100644
+--- meson.build
++++ meson.build
+@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
+ 
+ gnome = import('gnome')
+ gir = find_program('g-ir-scanner', required: false)
+-build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
++build_gir = gir.found() and not get_option('disable-introspection')
+ 
+ configure_file(output: 'config.h', configuration: cdata)
+ 
+
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index c8e4b27a559..5837679a329 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,10 +1,12 @@
 # Template file for 'libgxps'
 pkgname=libgxps
 version=0.3.1
-revision=1
+revision=2
 build_style=meson
-configure_args="-Denable-test=false -Ddisable-introspection=$(vopt_if gir false true)"
-hostmakedepends="pkg-config $(vopt_if gir gobject-introspection)"
+build_helper="gir"
+configure_args="-Denable-test=false
+ -Ddisable-introspection=$(vopt_if gir false true)"
+hostmakedepends="pkg-config"
 makedepends="cairo-devel libglib-devel libjpeg-turbo-devel libpng-devel
  tiff-devel lcms2-devel libarchive-devel freetype-devel"
 short_desc="GObject base library for XPS documents"
@@ -17,20 +19,22 @@ checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
 # Package build options
 build_options="gir"
 
-# Disable gir for cross builds.
-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
 
 libgxps-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	depends="cairo-devel libglib-devel libarchive-devel
+	 ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
 	}
 }