From 926152f16bda1c5399bbe168315376f3477932cb Mon Sep 17 00:00:00 2001
From: Câju Mihai-Drosi <cajum.bugs@yandex.com>
Date: Tue, 28 Jul 2020 04:07:19 +0300
Subject: vulkan-validation-layers: 1.2.131.2 -> 1.2.141.0

---
 .../tools/vulkan-validation-layers/default.nix     | 28 +++++++++++++++++-----
 pkgs/top-level/all-packages.nix                    | 12 +++++-----
 2 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 06a1e4025e1..0d3c227291f 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,23 +1,39 @@
 { stdenv, fetchFromGitHub, cmake, writeText, python3
-, vulkan-headers, vulkan-loader, glslang
+, vulkan-headers, vulkan-loader, glslang, spirv-headers
 , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.2.131.2";
+  version = "1.2.141.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "sdk-${version}";
-    sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn";
+    sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake python3  ];
-  buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ];
+  nativeBuildInputs = [
+    pkgconfig
+    cmake
+    python3
+  ];
+
+  buildInputs = [
+    glslang
+    spirv-headers
+    vulkan-headers
+    vulkan-loader
+    libxcb
+    libXrandr
+    wayland
+  ];
+
   enableParallelBuilding = true;
 
-  cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
+  cmakeFlags = [
+    "-DGLSLANG_INSTALL_DIR=${glslang}"
+  ];
 
   # Help vulkan-loader find the validation layers
   setupHook = writeText "setup-hook" ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8337ad3ddff..f4b0ae7dc31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15824,24 +15824,24 @@ in
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Tools";
-          rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
-          sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
+          rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
+          sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
         };
       });
       spirv-headers = spirv-tools.overrideAttrs (_: {
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Headers";
-          rev = "204cd131c42b90d129073719f2766293ce35c081";
-          sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
+          rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
+          sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
         };
       });
     }).overrideAttrs (_: {
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "glslang";
-        rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3";
-        sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg";
+        rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
+        sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
       };
     });
   };
-- 
cgit 1.4.1