diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 4c07a313c48..87d2fee059f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,15 +1,17 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-openldap --disable-uoa
- --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
- --with-nss-includes=/usr/include/nss --enable-vala-bindings"
-hostmakedepends="pkg-config intltool flex gperf gobject-introspection"
+ --with-krb5=${XBPS_CROSS_BASE}/usr
+ --with-nspr-includes=${XBPS_CROSS_BASE}/usr/include/nspr
+ --with-nss-includes=${XBPS_CROSS_BASE}/usr/include/nss
+ $(vopt_enable gir vala-bindings)"
+hostmakedepends="pkg-config intltool flex glib-devel gperf $(vopt_if gir gobject-introspection)"
 makedepends="db-devel sqlite-devel mit-krb5-devel nss-devel libical-devel
  libsecret-devel libsoup-gnome-devel gcr-devel libldap-devel
- libgdata-devel vala-devel libgweather-devel icu55-devel"
+ libgdata-devel $(vopt_if gir vala-devel) libgweather-devel icu55-devel"
 depends="libsoup-gnome>=2.46 libgweather>=3.12"
 short_desc="Centralized access to appointments and contacts"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -18,6 +20,23 @@ homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=4fe7c520a49d4c7fd67ed6fc2dfb33667f6138368c7bbe3ecd8c4ad2356771bc
 
+build_options="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+else
+	LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
+fi
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # Create iconv-detect.h for musl libc
+		echo '/* This is an auto-generated header, DO NOT EDIT! */' > iconv-detect.h
+		echo  >>iconv-detect.h
+		echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >>iconv-detect.h
+		echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h
+		;;
+	esac
+}
 post_install() {
 	# Fix broken pkg-config
 	sed -i "s|^Requires: gio-2.0, , |Requires: gio-2.0, mozilla-nspr, mozilla-nss|" \
@@ -33,7 +52,9 @@ evolution-data-server-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 	}
 }