cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vulkan-validation-layers: 1.3.254 -> 1.3.261

Browse source 
Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.3.254...v1.3.261
This commit is contained in:
K900 2023-08-22 20:01:51 +03:00
parent a1097a20c1
commit 670447c1a0
1 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/tools/vulkan-validation-layers/default.nix
View file

@ -14,33 +14,16 @@
, libXrandr , libXrandr
, spirv-headers , spirv-headers
, vulkan-headers , vulkan-headers
, vulkan-utility-libraries
, wayland , wayland
}: }:
let let
robin-hood-hashing = callPackage ./robin-hood-hashing.nix {}; robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
# Current VVL version requires a newer spirv-headers than the latest release tag.
# This should hopefully not be too common and the override should be removed after
# the next SPIRV headers release.
# FIXME: if this ever becomes common, figure out a way to pull revisions directly
# from upstream known-good.json
spirv-headers' = spirv-headers.overrideAttrs(_: {
version = "unstable-2023-04-27";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "7f1d2f4158704337aff1f739c8e494afc5716e7e";
hash = "sha256-DHOYIZQqP5uWDYdb+vePpMBaQDOCB5Pcg8wPBMF8itk=";
};
postPatch = "";
});
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vulkan-validation-layers"; pname = "vulkan-validation-layers";
version = "1.3.254"; version = "1.3.261";
# If we were to use "dev" here instead of headers, the setupHook would be # If we were to use "dev" here instead of headers, the setupHook would be
# placed in that output instead of "out". # placed in that output instead of "out".
@ -51,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers"; repo = "Vulkan-ValidationLayers";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hh/lCXSKq8xmygVsFFOGu79DvBvBPcc1l1e5wQskK7M="; hash = "sha256-4kE3pkyYu6hnbv19fHhON+hI2HU4vLm31tNlp5fhndM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -68,12 +51,13 @@ stdenv.mkDerivation rec {
libffi libffi
libxcb libxcb
vulkan-headers vulkan-headers
vulkan-utility-libraries
wayland wayland
]; ];
cmakeFlags = [ cmakeFlags = [
"-DGLSLANG_INSTALL_DIR=${glslang}" "-DGLSLANG_INSTALL_DIR=${glslang}"
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}" "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
"-DBUILD_LAYER_SUPPORT_FILES=ON" "-DBUILD_LAYER_SUPPORT_FILES=ON"
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"