diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index f339979b6a..1542c3b9de 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -66,7 +66,9 @@ if listcontains "${GRAPHIC_DRIVERS}" "(iris|panfrost)"; then
   PKG_MESON_OPTS_TARGET+=" -Dmesa-clc=system"
 fi
 
-if listcontains "${GRAPHIC_DRIVERS}" "(nvidia|nvidia-ng)"; then
+if listcontains "${GRAPHIC_DRIVERS}" "(nvidia|nvidia-ng)" ||
+              [ "${OPENGL_SUPPORT}" = "yes" ] &&
+              [ "${DISPLAYSERVER}" != "x11" ]; then
   PKG_DEPENDS_TARGET+=" libglvnd"
   PKG_MESON_OPTS_TARGET+=" -Dglvnd=enabled"
 else