diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 160bb3e41818..99c9aabbbbdd 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,4 +1,5 @@
 {
+  dri-pkgconfig-stub,
   egl-wayland,
   bash,
   libepoxy,
@@ -6,6 +7,7 @@
   fontutil,
   lib,
   libdecor,
+  libgbm,
   libei,
   libGL,
   libGLU,
@@ -30,7 +32,7 @@
   libxkbfile,
   libxshmfence,
   libxcvt,
-  mesa,
+  mesa-gl-headers,
   meson,
   ninja,
   openssl,
@@ -75,8 +77,10 @@ stdenv.mkDerivation rec {
   ];
   buildInputs =
     [
+      dri-pkgconfig-stub
       egl-wayland
       libdecor
+      libgbm
       libepoxy
       libei
       fontutil
@@ -100,7 +104,7 @@ stdenv.mkDerivation rec {
       libxkbfile
       libxshmfence
       libxcvt
-      mesa # uses dri_interface.h
+      mesa-gl-headers
       openssl
       pixman
       systemd