git.iko.soy/typeable/nixpkgs
on master help sign in
vulkan-validation-layers: 1.2.131.2 -> 1.2.141.0
commit926152f16bda1c5399bbe168315376f3477932cb authorCâju Mihai-Drosi <cajum.bugs@yandex.com> dateTue 28 Jul 2020, 04:07 (6 years ago) parent9efc9c8
2 files changed+28−12
pkgs/development/tools/vulkan-validation-layers/default.nix+22−6 pkgs/top-level/all-packages.nix+6−6
pkgs/development/tools/vulkan-validation-layers/default.nix+22−6
@@ -1,23 +1,39 @@
11{ stdenv, fetchFromGitHub, cmake, writeText, python3
2−, vulkan-headers, vulkan-loader, glslang
2+, vulkan-headers, vulkan-loader, glslang, spirv-headers
33, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
44
55stdenv.mkDerivation rec {
66 pname = "vulkan-validation-layers";
7− version = "1.2.131.2";
7+ version = "1.2.141.0";
88
99 src = fetchFromGitHub {
1010 owner = "KhronosGroup";
1111 repo = "Vulkan-ValidationLayers";
1212 rev = "sdk-${version}";
13− sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn";
13+ sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig cmake python3 ];
17− buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ];
16+ nativeBuildInputs = [
17+ pkgconfig
18+ cmake
19+ python3
20+ ];
21+
22+ buildInputs = [
23+ glslang
24+ spirv-headers
25+ vulkan-headers
26+ vulkan-loader
27+ libxcb
28+ libXrandr
29+ wayland
30+ ];
31+
1832 enableParallelBuilding = true;
1933
20− cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
34+ cmakeFlags = [
35+ "-DGLSLANG_INSTALL_DIR=${glslang}"
36+ ];
2137
2238 # Help vulkan-loader find the validation layers
2339 setupHook = writeText "setup-hook" ''
pkgs/top-level/all-packages.nix+6−6
@@ -15824,24 +15824,24 @@ in
1582415824 src = fetchFromGitHub {
1582515825 owner = "KhronosGroup";
1582615826 repo = "SPIRV-Tools";
15827− rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
15828− sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
15827+ rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
15828+ sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
1582915829 };
1583015830 });
1583115831 spirv-headers = spirv-tools.overrideAttrs (_: {
1583215832 src = fetchFromGitHub {
1583315833 owner = "KhronosGroup";
1583415834 repo = "SPIRV-Headers";
15835− rev = "204cd131c42b90d129073719f2766293ce35c081";
15836− sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
15835+ rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
15836+ sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
1583715837 };
1583815838 });
1583915839 }).overrideAttrs (_: {
1584015840 src = fetchFromGitHub {
1584115841 owner = "KhronosGroup";
1584215842 repo = "glslang";
15843− rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3";
15844− sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg";
15843+ rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
15844+ sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
1584515845 };
1584615846 });
1584715847 };