From f089fdbc8068878ce430e94df851c83c1d848567 Mon Sep 17 00:00:00 2001
From: Sean D Gillespie <sean@mistersg.net>
Date: Sun, 24 Apr 2022 14:43:17 -0400
Subject: Vulkan: 1.2.198.0 -> 1.3.211.0

Update:
 * glslang
 * spirv-headers
 * spirv-toools
 * vulkan-extension-layer
 * vulkan-headers
 * vulkan-loader
 * vulkan-tools
 * vulkan-tools-lunarg
 * vulkan-validation-layers

Fixes #161060
---
 .../tools/vulkan-validation-layers/default.nix     | 24 ++++++++++------
 .../robin-hood-hashing.nix                         | 33 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix

(limited to 'pkgs/development/tools/vulkan-validation-layers')

diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index dfc5ea9de6542..586aa1797bc4a 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,10 +1,15 @@
 { lib
+, callPackage
 , stdenv
 , fetchFromGitHub
 , cmake
+, pkgconfig
 , glslang
+, libffi
 , libX11
+, libXau
 , libxcb
+, libXdmcp
 , libXrandr
 , spirv-headers
 , spirv-tools
@@ -13,16 +18,11 @@
 }:
 
 let
-  robin-hood-hashing = fetchFromGitHub {
-    owner = "martinus";
-    repo = "robin-hood-hashing";
-    rev = "3.11.3"; # pin
-    sha256 = "1gm3lwjkh6h8m7lfykzd0jzhfqjmjchindkmxc008rwvxafsd1pl";
-  };
+  robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
 in
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.2.198.0";
+  version = "1.3.211.0";
 
   # If we were to use "dev" here instead of headers, the setupHook would be
   # placed in that output instead of "out".
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       owner = "KhronosGroup";
       repo = "Vulkan-ValidationLayers";
       rev = "sdk-${version}";
-      sha256 = "sha256-/pnXT55EQZcnjOzY2vBwp+gM6l2hktZHwB9yKP8vVTU=";
+      sha256 = "sha256-NGpFfekZtB0rvnGxYVDo808xzgBuo8ZC4bjXjQnTpxU=";
     });
 
   # Include absolute paths to layer libraries in their associated
@@ -45,12 +45,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    pkgconfig
   ];
 
   buildInputs = [
     libX11
-    libxcb
+    libXau
+    libXdmcp
     libXrandr
+    libffi
+    libxcb
+    spirv-tools
     vulkan-headers
     wayland
   ];
@@ -60,6 +65,7 @@ stdenv.mkDerivation rec {
     "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
     "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
     "-DBUILD_LAYER_SUPPORT_FILES=ON"
+    "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"
     # Hide dev warnings that are useless for packaging
     "-Wno-dev"
   ];
diff --git a/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix
new file mode 100644
index 0000000000000..cd08f0231ab20
--- /dev/null
+++ b/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "robin-hood-hashing";
+  version = "3.11.5"; # pin
+
+  src = fetchFromGitHub {
+    owner = "martinus";
+    repo = "robin-hood-hashing";
+    rev = version; # pin
+    sha256 = "sha256-J4u9Q6cXF0SLHbomP42AAn5LSKBYeVgTooOhqxOIpuM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  cmakeFlags = [
+    "-DRH_STANDALONE_PROJECT=OFF"
+  ];
+
+  meta = with lib; {
+    description = "A faster, more efficient replacement for std::unordered_map / std::unordered_set";
+    homepage    = "https://github.com/martinus/robin-hood-hashing";
+    platforms   = platforms.linux;
+    license     = licenses.mit;
+    maintainers = [ ];
+  };
+}
-- 
cgit 1.4.1