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

mesa-demos: fix cross compilation, set strictDeps

authored by

Nick Cao and committed by
GitHub
06adb25e 3074443c

+46 -8
+46 -8
pkgs/tools/graphics/mesa-demos/default.nix
··· 1 - { lib, stdenv, fetchurl 2 - , freeglut, glew, libGL, libGLU, libX11, libXext, mesa 3 - , meson, ninja, pkg-config, wayland, wayland-protocols 4 - , vulkan-loader, libxkbcommon, libdecor, glslang }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , freeglut 5 + , libGL 6 + , libGLU 7 + , libX11 8 + , libXext 9 + , mesa 10 + , meson 11 + , ninja 12 + , pkg-config 13 + , wayland 14 + , wayland-scanner 15 + , wayland-protocols 16 + , vulkan-loader 17 + , libxkbcommon 18 + , libdecor 19 + , glslang 20 + }: 5 21 6 22 stdenv.mkDerivation rec { 7 23 pname = "mesa-demos"; ··· 12 28 sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs="; 13 29 }; 14 30 31 + strictDeps = true; 32 + 33 + depsBuildBuild = [ 34 + pkg-config 35 + ]; 36 + 37 + nativeBuildInputs = [ 38 + meson 39 + ninja 40 + pkg-config 41 + wayland-scanner 42 + glslang 43 + ]; 44 + 15 45 buildInputs = [ 16 - freeglut glew libX11 libXext libGL libGLU mesa wayland 17 - wayland-protocols vulkan-loader libxkbcommon libdecor glslang 18 - ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ; 19 - nativeBuildInputs = [ meson ninja pkg-config wayland ]; 46 + freeglut 47 + libX11 48 + libXext 49 + libGL 50 + libGLU 51 + mesa 52 + wayland 53 + wayland-protocols 54 + vulkan-loader 55 + libxkbcommon 56 + libdecor 57 + ] ++ lib.optional (mesa ? osmesa) mesa.osmesa; 20 58 21 59 mesonFlags = [ 22 60 "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}"