diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template
index 8d0100836a5..1b5e69f6f6b 100644
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@@ -1,18 +1,19 @@
 # Template file for 'gucharmap'
 pkgname=gucharmap
 version=11.0.3
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-schemas-compile  $(vopt_enable gir introspection)
  --with-unicode-data=${XBPS_SRCDISTDIR}/${pkgname}-${version}"
 hostmakedepends="pkg-config intltool gnome-doc-utils itstool glib-devel
- desktop-file-utils appdata-tools unzip $(vopt_if gir gobject-introspection)"
+ desktop-file-utils appdata-tools unzip"
 makedepends="gtk+3-devel hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="GNOME Unicode Charmap"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-homepage="https://wiki.gnome.org/Apps/Gucharmap"
 license="GPL-3.0-or-later, GFDL-1.3-only, Unicode-DFS-2015"
+homepage="https://wiki.gnome.org/Apps/Gucharmap"
 distfiles="${GNOME_SITE}/gucharmap/${version%.*}/gucharmap-${version}.tar.xz
  https://www.unicode.org/Public/${version/.*/}.0.0/ucd/Blocks.txt
  https://www.unicode.org/Public/${version/.*/}.0.0/ucd/DerivedAge.txt
@@ -20,7 +21,6 @@ distfiles="${GNOME_SITE}/gucharmap/${version%.*}/gucharmap-${version}.tar.xz
  https://www.unicode.org/Public/${version/.*/}.0.0/ucd/Scripts.txt
  https://www.unicode.org/Public/${version/.*/}.0.0/ucd/UnicodeData.txt
  https://www.unicode.org/Public/${version/.*/}.0.0/ucd/Unihan.zip"
-skip_extraction="Blocks.txt DerivedAge.txt NamesList.txt Scripts.txt UnicodeData.txt Unihan.zip"
 checksum="6fe4405aa4d2edeedf412befa3cdf423211c80f8836085c4c8c56679658e37fa
  0b457b66c788a97c8521e265f0b793d4ed911356d39eb61029f9cef8554cd052
  eb115a5de9a32c9ad447d6ea1cddcadb53d47f6cbc2521f3fe0bebb040c39866
@@ -28,14 +28,16 @@ checksum="6fe4405aa4d2edeedf412befa3cdf423211c80f8836085c4c8c56679658e37fa
  e9f3c0aa3c4f892b589c809cf4ae051a39921417cda6fefdbe43717b92db76d5
  4997a3196eb79b4d0d6b8384560f6aeb46a062693f0abd5ba736abbff7976099
  72079d9d64acd452e1496f67b975a82a989f0023f37aed092c51cf13567fc833"
+skip_extraction="Blocks.txt DerivedAge.txt NamesList.txt Scripts.txt UnicodeData.txt Unihan.zip"
 
 # 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
 
 LDFLAGS+=" -ldl"
 
@@ -50,10 +52,10 @@ gucharmap-devel_package() {
 	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/*.so"
 	}
 }