From af2f4acd8f033cd2e29d2093cb472aea12c4cc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?= <65301509+KiruyaMomochi@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:38:04 +0800 Subject: [PATCH] vulkan-tools-lunarg: fix CMake include path --- .../graphics/vulkan-tools-lunarg/default.nix | 2 ++ .../graphics/vulkan-tools-lunarg/gtest.patch | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 5a7e7fd85238..e8d3907251ba 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -81,6 +81,8 @@ stdenv.mkDerivation rec { done ''; + patches = [ ./gtest.patch ]; + # Same as vulkan-validation-layers dontPatchELF = true; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch new file mode 100644 index 000000000000..cf062a8591ff --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch @@ -0,0 +1,34 @@ +diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt +index e7df8ec53d..869bfcb716 100644 +--- a/external/googletest/googlemock/CMakeLists.txt ++++ b/external/googletest/googlemock/CMakeLists.txt +@@ -111,10 +111,10 @@ endif() + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gmock SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + target_include_directories(gmock_main SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + endif() + + ######################################################################## +diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt +index abdd98b79a..7ae174d566 100644 +--- a/external/googletest/googletest/CMakeLists.txt ++++ b/external/googletest/googletest/CMakeLists.txt +@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gtest SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + target_include_directories(gtest_main SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + endif() + target_link_libraries(gtest_main PUBLIC gtest) +