Merge pull request #231603 from NickCao/mesa-demos-cross

mesa-demos: fix cross compilation, set strictDeps

pkgs/tools/graphics/mesa-demos/default.nix

@@ -1,7 +1,23 @@
-{ lib, stdenv, fetchurl
+{ lib
-, freeglut, glew, libGL, libGLU, libX11, libXext, mesa
+, stdenv
-, meson, ninja, pkg-config, wayland, wayland-protocols
+, fetchurl
-, vulkan-loader, libxkbcommon, libdecor, glslang }:
+, freeglut
+, libGL
+, libGLU
+, libX11
+, libXext
+, mesa
+, meson
+, ninja
+, pkg-config
+, wayland
+, wayland-scanner
+, wayland-protocols
+, vulkan-loader
+, libxkbcommon
+, libdecor
+, glslang
+}:
 
 stdenv.mkDerivation rec {
   pname = "mesa-demos";
@@ -12,11 +28,33 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs=";
   };
 
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+    glslang
+  ];
+
   buildInputs = [
-    freeglut glew libX11 libXext libGL libGLU mesa wayland
+    freeglut
-    wayland-protocols vulkan-loader libxkbcommon libdecor glslang
+    libX11
-  ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ;
+    libXext
-  nativeBuildInputs = [ meson ninja pkg-config wayland ];
+    libGL
+    libGLU
+    mesa
+    wayland
+    wayland-protocols
+    vulkan-loader
+    libxkbcommon
+    libdecor
+  ] ++ lib.optional (mesa ? osmesa) mesa.osmesa;
 
   mesonFlags = [
     "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}"