JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan-cts: 1.3.8.3 -> 1.3.9.0

Browse Source 
Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.9.0
This commit is contained in:
Sebastian Neubauer 2024-06-24 16:21:10 +02:00
parent a71e967ef3
commit 22701c68cf
No known key found for this signature in database
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/graphics/vulkan-cts/default.nix
View File

@ -4,6 +4,7 @@
, runCommand
, cmake
, ffmpeg_4
, glslang
, libdrm
, libglvnd
, libffi
@ -17,7 +18,10 @@
, ninja
, pkg-config
, python3
, spirv-headers
, vulkan-headers
, vulkan-loader
, vulkan-utility-libraries
, wayland
, wayland-protocols
, wayland-scanner
@ -39,13 +43,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-cts";
version = "1.3.8.3";
version = "1.3.9.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "VK-GL-CTS";
rev = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-+xmbPezWTEwjxX+o2b7FjQcsoWxWe0RTSaTJOrXSIhc=";
hash = "sha256-JCepNBVHaN4KXRcLOZ2z7toBMri90tV7kjNWHRXRESE=";
};
prePatch = ''
@ -55,6 +59,9 @@ stdenv.mkDerivation (finalAttrs: {
${sources.prePatch}
substituteInPlace external/vulkan-validationlayers/CMakeLists.txt \
--replace-fail 'UPDATE_DEPS ON' 'UPDATE_DEPS OFF'
chmod u+w -R external
'';
@ -68,6 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
libXau
libXdmcp
libxcb
vulkan-headers
vulkan-utility-libraries
wayland
wayland-protocols
zlib
@ -89,6 +98,9 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DWAYLAND_SCANNER=wayland-scanner"
# For vulkan-validation-layers
"-DGLSLANG_INSTALL_DIR=${glslang}"
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
];
postInstall = ''

30
pkgs/tools/graphics/vulkan-cts/sources.nix
View File

@ -4,15 +4,15 @@ rec {
amber = fetchFromGitHub {
owner = "google";
repo = "amber";
rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc";
hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg=";
rev = "0f003c2785489f59cd01bb2440fcf303149100f2";
hash = "sha256-Q3LP8hQrKeM8J0qmJyTeC8Hq949Fe0wOjnkiia+UDag=";
};
glslang = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "bada5c87ec6db4441db129d8506742c4a72bd610";
hash = "sha256-GayYjvJ935arbe4GUg8l6KhfImBCpqWRe8xSqlxXLYQ=";
rev = "b9b8fd917b195f680a1ce3f3f663c03e1c82579d";
hash = "sha256-85kHk1KqhhOqLodRVVpQMhE44IQnzLoFXf/YPNY8aUI=";
};
jsoncpp = fetchFromGitHub {
@ -32,27 +32,34 @@ rec {
spirv-headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "d3c2a6fa95ad463ca8044d7fc45557db381a6a64";
hash = "sha256-POd/TnbVzq/Xyi0O4hU24Qk4LDD5Af2kHJgQ+wPVDsg=";
rev = "4f7b471f1a66b6d06462cd4ba57628cc0cd087d7";
hash = "sha256-CAmDDqeMVKNdV/91VQYAKyCc+e+H99PRYZzt5WjswBI=";
};
spirv-tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "f9184c6501f7e349e0664d281ac93b1db9c1e5ad";
hash = "sha256-BDnKOUIWZVGPPwmQsMqF1yWy80dl75kdaoztUMnlrqc=";
rev = "dd4b663e13c07fea4fbb3f70c1c91c86731099f7";
hash = "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo=";
};
vulkan-docs = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Docs";
rev = "d99193d3fcc4b2a0dacc0a9d7e4951ea611a3e96";
hash = "sha256-pfPErjZ4jSxEg+OgFcELyvqrS0Hm3QWQ3WhQ9T3rJbQ=";
rev = "dedb71a7edc6d5af3f9bfd5e2ef53814de999ef7";
hash = "sha256-A61qx7sdcRipX4mHpGJVhd9Qlcv1xcjeGGnfyblMxUg=";
};
vulkan-validationlayers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "f589bc456545fbab97caf49380b102b8aafe1f40";
hash = "sha256-ZNJGGrUwTw3I0MQl9nKqGhb2bdPZZl+AR3YH3T+cn+c=";
};
prePatch = ''
mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs
mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs external/vulkan-validationlayers
cp -r ${amber} external/amber/src
cp -r ${glslang} external/glslang/src
@ -61,5 +68,6 @@ rec {
cp -r ${spirv-headers} external/spirv-headers/src
cp -r ${spirv-tools} external/spirv-tools/src
cp -r ${vulkan-docs} external/vulkan-docs/src
cp -r ${vulkan-validationlayers} external/vulkan-validationlayers/src
'';
}