diff options
| author | Kira Bruneau <kira.bruneau@pm.me> | 2021-05-06 12:46:30 -0400 |
|---|---|---|
| committer | Joe Hermaszewski <git@monoid.al> | 2021-07-24 10:49:12 +0800 |
| commit | ddd5302e6cd004a83640f32de97dc1410c52b2f7 (patch) | |
| tree | 4fee9fa81615d5a0c566a7d149227626474e403f /pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | |
| parent | 073b8ce7388a5a6eb0b6a1f6e2597511167585d2 (diff) | |
| download | nixpkgs-ddd5302e6cd004a83640f32de97dc1410c52b2f7.tar nixpkgs-ddd5302e6cd004a83640f32de97dc1410c52b2f7.tar.gz nixpkgs-ddd5302e6cd004a83640f32de97dc1410c52b2f7.tar.bz2 nixpkgs-ddd5302e6cd004a83640f32de97dc1410c52b2f7.tar.lz nixpkgs-ddd5302e6cd004a83640f32de97dc1410c52b2f7.tar.xz nixpkgs-ddd5302e6cd004a83640f32de97dc1410c52b2f7.tar.zst nixpkgs-ddd5302e6cd004a83640f32de97dc1410c52b2f7.zip | |
vulkan-tools-lunarg: 1.2.162.0 → 1.2.176.0
Diffstat (limited to 'pkgs/tools/graphics/vulkan-tools-lunarg/default.nix')
| -rw-r--r-- | pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 1d0f920a4ba..d3c66957e7b 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -1,26 +1,44 @@ -{ stdenv, cmake, expat, fetchFromGitHub, jq, lib, libXdmcp, libXrandr, libffi -, libxcb, pkg-config, python3, symlinkJoin, vulkan-headers, vulkan-loader -, vulkan-validation-layers, wayland, writeText, xcbutilkeysyms, xcbutilwm -, xlibsWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, jq +, expat +, libX11 +, libXdmcp +, libXrandr +, libffi +, libxcb +, wayland +, xcbutilkeysyms +, xcbutilwm +, vulkan-headers +, vulkan-loader +, symlinkJoin +, vulkan-validation-layers +, writeText +}: stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.2.162.0"; + version = "1.2.176.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - sha256 = "13v4202bfd7d7nwi8w12ja9k1vi10p9xxypzkpi063hmsgzxm5k5"; + sha256 = "0p527nml2aj10rra2588dhvjmz63i6b69mc84x9s5wp85sazxxl1"; fetchSubmodules = true; }); - nativeBuildInputs = [ cmake pkg-config python3 jq ]; + nativeBuildInputs = [ cmake python3 jq ]; buildInputs = [ expat + libX11 libXdmcp libXrandr libffi @@ -28,7 +46,6 @@ stdenv.mkDerivation rec { wayland xcbutilkeysyms xcbutilwm - xlibsWrapper ]; cmakeFlags = [ @@ -40,6 +57,8 @@ stdenv.mkDerivation rec { paths = [ vulkan-validation-layers.headers vulkan-validation-layers ]; } }" + # Hide dev warnings that are useless for packaging + "-Wno-dev" ]; preConfigure = '' @@ -63,7 +82,6 @@ stdenv.mkDerivation rec { ''; # Same as vulkan-validation-layers - libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; dontPatchELF = true; # Help vulkan-loader find the validation layers |