diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk
index f82675e465..d4a03469e8 100644
--- a/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk
@@ -8,5 +8,5 @@ PKG_SHA256="cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gnome.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/${PKG_VERSION:0:4}/at-spi2-atk-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain at-spi2-core atk libX11 libxml2"
+PKG_DEPENDS_TARGET="toolchain at-spi2-core atk libxml2"
 PKG_LONGDESC="A GTK+ module that bridges ATK to D-Bus at-spi."
diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk
index a7a6675968..478662e987 100644
--- a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk
@@ -8,13 +8,25 @@ PKG_SHA256="c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.gnome.org/"
 PKG_URL="https://download.gnome.org/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst"
+PKG_DEPENDS_TARGET="toolchain atk dbus glib"
 PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi."
 
-PKG_MESON_OPTS_TARGET="-Ddocs=false \
-                       -Dintrospection=disabled \
-                       -Ddbus_daemon=/usr/bin/dbus-daemon"
+configure_package() {
+  # Build with x11 support
+  if [ ${DISPLAYSERVER} = "x11" ]; then
+    PKG_DEPENDS_TARGET+=" libXtst"
+  fi
+}
 
 pre_configure_target() {
-  TARGET_LDFLAGS="${LDFLAGS} -lXext"
+  PKG_MESON_OPTS_TARGET="-Ddocs=false \
+                         -Dintrospection=disabled \
+                         -Ddbus_daemon=/usr/bin/dbus-daemon"
+
+  if [ ${DISPLAYSERVER} = "x11" ]; then
+    PKG_MESON_OPTS_TARGET+="-Dx11=true"
+    TARGET_LDFLAGS="${LDFLAGS} -lXext"
+  else
+    PKG_MESON_OPTS_TARGET+="-Dx11=false"
+  fi
 }
diff --git a/packages/graphics/libepoxy/package.mk b/packages/graphics/libepoxy/package.mk
index 8217b0558d..964789c7d6 100644
--- a/packages/graphics/libepoxy/package.mk
+++ b/packages/graphics/libepoxy/package.mk
@@ -16,14 +16,21 @@ PKG_URL="https://github.com/anholt/libepoxy/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Epoxy is a library for handling OpenGL function pointer management for you."
 
-if [ "${OPENGL_SUPPORT}" = "yes" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL}"
-fi
+configure_package() {
+  if [ "${OPENGL_SUPPORT}" = "yes" ]; then
+    PKG_DEPENDS_TARGET+=" ${OPENGL}"
+  fi
 
-if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-fi
+  if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
+    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  fi
+}
 
-if [ "${DISPLAYSERVER}" != "x11" ]; then
-  PKG_MESON_OPTS_TARGET="-Dglx=no"
-fi
+pre_configure_target() {
+  PKG_MESON_OPTS_TARGET="-Dtests=false"
+
+  if [ "${DISPLAYSERVER}" != "x11" ]; then
+    PKG_MESON_OPTS_TARGET+=" -Dglx=no \
+                            -Dx11=false"
+  fi
+}