diff options
Diffstat (limited to 'pkgs/tools/graphics/vulkan-tools/default.nix')
-rw-r--r-- | pkgs/tools/graphics/vulkan-tools/default.nix | 44 |
1 files changed, 38 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 987511b1cc967..77d23df4923f5 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,9 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, cmake, glslang, libX11, libxcb -, libXrandr, vulkan-headers, vulkan-loader, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, glslang +, libffi +, libX11 +, libXau +, libxcb +, libXdmcp +, libXrandr +, vulkan-headers +, vulkan-loader +, wayland +, wayland-protocols +}: stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.198.0"; + version = "1.3.211.0"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with @@ -13,11 +28,27 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "sha256-oNJm9Gi41aA5krkpkQI0EYdIlMcQpdodv9yqXhnNURA="; + sha256 = "sha256-iXsWTKNllPZy1Kpo3JHzEEus3Hu9LofvMB3c4Gn6/DM="; }); - nativeBuildInputs = [ cmake ]; - buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + glslang + libffi + libX11 + libXau + libxcb + libXdmcp + libXrandr + vulkan-headers + vulkan-loader + wayland + wayland-protocols + ]; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; @@ -28,6 +59,7 @@ stdenv.mkDerivation rec { "-DBUILD_ICD=OFF" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" + "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ]; |