mesa.diff

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7eb18dd31c1..789a7f063bc 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -103,6 +103,7 @@ stdenv.mkDerivation {
     "-Dgallium-nine=true" # Direct3D in Wine
   ];

+
   buildInputs = with xorg; [
     expat llvmPackages.llvm libglvnd xorgproto
     libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
@@ -112,10 +113,13 @@ stdenv.mkDerivation {
     ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
     ++ lib.optional withValgrind valgrind-light;

+  depsBuildBuild = [ pkgconfig ];
+
   nativeBuildInputs = [
     pkgconfig meson ninja
     intltool bison flex file
     python3Packages.python python3Packages.Mako
+    wayland
   ];

   propagatedBuildInputs = with xorg; [

What worked for me was something like this:

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7eb18dd31c1..d4556fc2637 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,4 +1,5 @@
 { stdenv, lib, fetchurl, fetchpatch
+, pkgsBuildTarget
 , pkgconfig, intltool, ninja, meson
 , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
@@ -116,8 +117,13 @@ stdenv.mkDerivation {
     pkgconfig meson ninja
     intltool bison flex file
     python3Packages.python python3Packages.Mako
+    wayland
   ];

+  preUnpack = ''
+    export PKG_CONFIG_PATH_FOR_BUILD="${pkgsBuildTarget.wayland}/lib/pkgconfig"
+  '';
+
   propagatedBuildInputs = with xorg; [
     libXdamage libXxf86vm
   ] ++ optional stdenv.isLinux libdrm