diff options
author | K900 <me@0upti.me> | 2023-08-22 20:02:16 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-08-22 20:31:45 +0300 |
commit | 8d8f1def2137e50320dde46597d4719df48e803c (patch) | |
tree | 22c9ab6fd74b0124af01037ce3c5a1e764eec52c /pkgs | |
parent | 6c37d0f5744de2e0fa7e7853c058a6dff1457f47 (diff) | |
download | nixpkgs-8d8f1def2137e50320dde46597d4719df48e803c.tar nixpkgs-8d8f1def2137e50320dde46597d4719df48e803c.tar.gz nixpkgs-8d8f1def2137e50320dde46597d4719df48e803c.tar.bz2 nixpkgs-8d8f1def2137e50320dde46597d4719df48e803c.tar.lz nixpkgs-8d8f1def2137e50320dde46597d4719df48e803c.tar.xz nixpkgs-8d8f1def2137e50320dde46597d4719df48e803c.tar.zst nixpkgs-8d8f1def2137e50320dde46597d4719df48e803c.zip |
vulkan-tools-lunarg: 1.3.250 -> 1.3.261
Diff: https://github.com/LunarG/VulkanTools/compare/v1.3.250...v1.3.261
Diffstat (limited to 'pkgs')
3 files changed, 6 insertions, 49 deletions
diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch deleted file mode 100644 index 4d571736330..00000000000 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/layersvt/api_dump.h b/layersvt/api_dump.h -index 6e13b6de3..33bee96e7 100644 ---- a/layersvt/api_dump.h -+++ b/layersvt/api_dump.h -@@ -60,6 +60,8 @@ - #include <unordered_set> - #include <utility> - -+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -+ - #ifdef ANDROID - - #include <android/log.h> -diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp -index b9743371c..6ee65c576 100755 ---- a/layersvt/screenshot.cpp -+++ b/layersvt/screenshot.cpp -@@ -44,6 +44,8 @@ using namespace std; - - #include "screenshot_parsing.h" - -+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -+ - #ifdef ANDROID - - #include <android/log.h> diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 8dec2e5130e..072876e46de 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -5,6 +5,7 @@ , python3 , jq , expat +, jsoncpp , libX11 , libXdmcp , libXrandr @@ -24,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.250"; + version = "1.3.261"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "v${version}"; - hash = "sha256-oI2ITvciuE/f8ojFpIwcH+HnYCasz43nKkER3wJxX+c="; + hash = "sha256-Kem3nWVaMeDEsidKYMsWr9Bu0yBgjjennDB0sKBDogA="; fetchSubmodules = true; }; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat + jsoncpp libX11 libXdmcp libXrandr @@ -70,6 +72,8 @@ stdenv.mkDerivation rec { patchShebangs scripts/* sed -i '/^git /d' $update ./$update + + substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp" ''; # Include absolute paths to layer libraries in their associated @@ -82,14 +86,6 @@ stdenv.mkDerivation rec { ''; patches = [ - # Redefine an internal macro removed in vulkan-validation-layers - # FIXME: remove when fixed upstream - ./add-missing-macro-definition.patch - - # Skip QNX-specific extension causing build failures - # FIXME: remove when fixed upstream - ./skip-qnx-extension.patch - ./gtest.patch ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch deleted file mode 100644 index 777b32f43af..00000000000 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 209f3ec39..c711af38b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -190,7 +190,7 @@ endif() - # Define macro used for building vk.xml generated files - function(run_vulkantools_vk_xml_generate dependency output) - add_custom_command(OUTPUT ${output} -- COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} -+ COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} -removeExtensions VK_QNX_external_memory_screen_buffer - DEPENDS ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/reg.py - ) - endfunction() |