dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

vulkan-tools-lunarg: 1.3.261 -> 1.3.268

Browse Source
This commit is contained in:
K900 2023-10-24 18:06:47 +03:00
parent b92c1d2224
commit 41a923ecc3
2 changed files with 9 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
View File

@ -16,23 +16,22 @@
, which
, xcbutilkeysyms
, xcbutilwm
, valijson
, vulkan-headers
, vulkan-loader
, symlinkJoin
, vulkan-validation-layers
, vulkan-utility-libraries
, writeText
}:
stdenv.mkDerivation rec {
pname = "vulkan-tools-lunarg";
version = "1.3.261";
version = "1.3.268.0";
src = fetchFromGitHub {
owner = "LunarG";
repo = "VulkanTools";
rev = "v${version}";
hash = "sha256-Kem3nWVaMeDEsidKYMsWr9Bu0yBgjjennDB0sKBDogA=";
fetchSubmodules = true;
rev = "vulkan-sdk-${version}";
hash = "sha256-2ZUD+RBsl35QV3250JOPCIoJb4sJcBsiRE4SZaS6ROs=";
};
nativeBuildInputs = [ cmake python3 jq which pkg-config ];
@ -45,6 +44,10 @@ stdenv.mkDerivation rec {
libXrandr
libffi
libxcb
valijson
vulkan-headers
vulkan-loader
vulkan-utility-libraries
wayland
xcbutilkeysyms
xcbutilwm
@ -52,27 +55,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
"-DVULKAN_LOADER_INSTALL_DIR=${vulkan-loader}"
"-DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=${
symlinkJoin {
name = "vulkan-validation-layers-merged";
paths = [ vulkan-validation-layers.headers vulkan-validation-layers ];
}
}"
# Hide dev warnings that are useless for packaging
"-Wno-dev"
];
preConfigure = ''
# We need to run this update script which generates some source files,
# Remove the line in it which calls 'git submodule update' though.
# Also patch the scripts in ./scripts
update=update_external_sources.sh
patchShebangs $update
patchShebangs scripts/*
sed -i '/^git /d' $update
./$update
substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp"
'';
@ -85,13 +71,6 @@ stdenv.mkDerivation rec {
done
'';
patches = [
./gtest.patch
];
# Same as vulkan-validation-layers
dontPatchELF = true;
# Help vulkan-loader find the validation layers
setupHook = writeText "setup-hook" ''
export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}

34
pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch
View File

@ -1,34 +0,0 @@
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
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
target_include_directories(gmock_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_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
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
target_include_directories(gtest_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
endif()
target_link_libraries(gtest_main PUBLIC gtest)