From 073b8ce7388a5a6eb0b6a1f6e2597511167585d2 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 6 May 2021 12:46:16 -0400 Subject: vulkan-tools: 1.2.162.0 → 1.2.176.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/vulkan-tools/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/tools/graphics/vulkan-tools/default.nix') diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 907404ec7f4..7f78b5b87c0 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,20 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader, - vulkan-headers, glslang, pkg-config, xlibsWrapper, libxcb, - libXrandr, wayland }: +{ stdenv, lib, fetchFromGitHub, cmake, glslang, libX11, libxcb +, libXrandr, vulkan-headers, vulkan-loader, wayland }: stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.162.0"; + version = "1.2.176.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz"; + sha256 = "15jkjn3ildam4ad2x0d8ysm3i2l6nrvqv0h44spkipf13bqiq5wg"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ]; libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; @@ -23,9 +22,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ # Don't build the mock ICD as it may get used instead of other drivers, if installed "-DBUILD_ICD=OFF" - "-DGLSLANG_INSTALL_DIR=${glslang}" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" + # Hide dev warnings that are useless for packaging + "-Wno-dev" ]; meta = with lib; { -- cgit 1.4.1