From 2501529a79b527c08a909737c8c1f88e8a945a0a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 29 Sep 2024 09:54:52 -0400 Subject: [PATCH] vulkan-validation-layers: fix cross compilation, set strictDeps --- .../tools/vulkan-validation-layers/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index d5de37245c21..c5331ea2475f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { hash = "sha256-FMzQpc7mwZGib544w0Dx6LeGi64cercm5oUW45raasc="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config @@ -40,12 +42,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glslang libX11 libXau libXdmcp libXrandr libffi libxcb + robin-hood-hashing + spirv-headers spirv-tools vulkan-headers vulkan-utility-libraries @@ -53,11 +58,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" - "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ];