commit cd5e437409a9fcdb44566b555f5c3e2f1b77fa3c · pyrox.dev/nixpkgs

pkgs/tools/graphics/vulkan-tools-lunarg/default.nix

···

       81
       81
        
           done

     

       82
       82
        
         '';

     

       83
       83
        
       

     

       84
       84
       +
         patches = [ ./gtest.patch ];

     

       85
       85
       +
       

     

       84
       86
        
         # Same as vulkan-validation-layers

     

       85
       87
        
         dontPatchELF = true;

     

       86
       88

+34

pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch

···

       1
       1
       +
       diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt

     

       2
       2
       +
       index e7df8ec53d..869bfcb716 100644

     

       3
       3
       +
       --- a/external/googletest/googlemock/CMakeLists.txt

     

       4
       4
       +
       +++ b/external/googletest/googlemock/CMakeLists.txt

     

       5
       5
       +
       @@ -111,10 +111,10 @@ endif()

     

       6
       6
       +
        if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")

     

       7
       7
       +
          target_include_directories(gmock SYSTEM INTERFACE

     

       8
       8
       +
            "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"

     

       9
       9
       +
       -    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")

     

       10
       10
       +
       +    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")

     

       11
       11
       +
          target_include_directories(gmock_main SYSTEM INTERFACE

     

       12
       12
       +
            "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"

     

       13
       13
       +
       -    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")

     

       14
       14
       +
       +    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")

     

       15
       15
       +
        endif()

     

       16
       16
       +
        

     

       17
       17
       +
        ########################################################################

     

       18
       18
       +
       diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt

     

       19
       19
       +
       index abdd98b79a..7ae174d566 100644

     

       20
       20
       +
       --- a/external/googletest/googletest/CMakeLists.txt

     

       21
       21
       +
       +++ b/external/googletest/googletest/CMakeLists.txt

     

       22
       22
       +
       @@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})

     

       23
       23
       +
        if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")

     

       24
       24
       +
          target_include_directories(gtest SYSTEM INTERFACE

     

       25
       25
       +
            "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"

     

       26
       26
       +
       -    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")

     

       27
       27
       +
       +    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")

     

       28
       28
       +
          target_include_directories(gtest_main SYSTEM INTERFACE

     

       29
       29
       +
            "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"

     

       30
       30
       +
       -    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")

     

       31
       31
       +
       +    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")

     

       32
       32
       +
        endif()

     

       33
       33
       +
        target_link_libraries(gtest_main PUBLIC gtest)

     

       34
       34
       +