diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index b206788a73..d78b838587 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -3,7 +3,6 @@ pkgname=weston
 version=1.2.1
 revision=1
 build_style=gnu-configure
-configure_args="--with-cairo-glesv2"
 short_desc="Reference implementation of a Wayland compositor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wayland.freedesktop.org/"
@@ -30,10 +29,14 @@ armv6l) # Assume RPi for now.
 	;;
 x86_64|i686)
 	makedepends+=" libXcursor-devel colord-devel glu-devel"
-	configure_args+=" --enable-demo-clients"
+	configure_args+=" --with-cairo-glesv2 --enable-demo-clients"
 	;;
 esac
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" wayland-devel"
+fi
+
 post_install() {
 	vinstall COPYING 644 usr/share/license/$pkgname
 	# Remove development files.