gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk-bootstrap: 0.7 -> 1.4.335 (#487986)

Browse Source
This commit is contained in:
Marcin Serwin
2026-03-08 07:50:05 +00:00
committed by GitHub
parent b7aa74ce8d a456e4095d
commit 40fc728212
3 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/vk/vk-bootstrap/0001-disable-fetch-content.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ec2d39..f52313d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +128,8 @@ if(VK_BOOTSTRAP_TEST)
endif()
endif()
- add_subdirectory(ext)
+ find_package(glfw3)
+ find_package(Catch2 3)
add_subdirectory(tests)
add_subdirectory(example)
endif ()
pkgs/by-name/vk/vk-bootstrap/0002-fix-install-tests.patch
+38
View File
@@ -0,0 +1,38 @@
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0b4f2e1..4dd1fe0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -58,14 +58,16 @@ list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/extras)
include(Catch)
catch_discover_tests(vk-bootstrap-test)
-# Test add_subdirectory support using fetch content vulkan headers
-add_test(NAME integration.add_subdirectory.fetch_content_vulkan_headers
- COMMAND ${CMAKE_CTEST_COMMAND}
- --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory/fetch_content_vulkan_headers
- --build-generator ${CMAKE_GENERATOR}
- --build-options -DADD_SUBDIRECTORY_TESTING=ON -DVULKAN_HEADER_VERSION_GIT_TAG=${VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG}
-)
+# Commented out for nixpkgs due to external dependencies.
+#
+# # Test add_subdirectory support using fetch content vulkan headers
+# add_test(NAME integration.add_subdirectory.fetch_content_vulkan_headers
+# COMMAND ${CMAKE_CTEST_COMMAND}
+# --build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration
+# ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory/fetch_content_vulkan_headers
+# --build-generator ${CMAKE_GENERATOR}
+# --build-options -DADD_SUBDIRECTORY_TESTING=ON -DVULKAN_HEADER_VERSION_GIT_TAG=${VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG}
+# )
get_target_property(vulkan_headers_include_dir Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
@@ -105,7 +107,7 @@ if (VulkanHeaders_FOUND)
--build-and-test ${CMAKE_CURRENT_LIST_DIR}/integration
${CMAKE_CURRENT_BINARY_DIR}/find_package/find_package_vulkan_headers
--build-generator ${CMAKE_GENERATOR}
- --build-options -DFIND_PACKAGE_TESTING=ON "-DCMAKE_PREFIX_PATH=${vulkan_headers_install_dir};${test_install_dir}"
+ --build-options -DFIND_PACKAGE_TESTING=ON "-DCMAKE_PREFIX_PATH=${vulkan_headers_install_dir};${test_install_dir};${CMAKE_INSTALL_PREFIX}"
)
set_tests_properties(integration.find_package.find_package_vulkan_headers PROPERTIES DEPENDS integration.install)
pkgs/by-name/vk/vk-bootstrap/package.nix
+20 -20
View File
@@ -5,40 +5,40 @@
cmake,
vulkan-headers,
glfw,
catch2,
catch2_3,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vk-bootstrap";
version = "0.7";
outputs = [
"out"
"dev"
];
version = "1.4.335";
src = fetchFromGitHub {
owner = "charles-lunarg";
repo = "vk-bootstrap";
rev = "v${finalAttrs.version}";
hash = "sha256-X3ANqfplrCF1R494+H5/plcwMH7rbW6zpLA4MZrYaoE=";
hash = "sha256-WFROoVAOl4HBNb/a8rx522Zz2LP4m2Zk03jckWxv7w0=";
};
postPatch = ''
# Upstream uses cmake FetchContent to resolve glfw and catch2
# needed for examples and tests
sed -i 's=add_subdirectory(ext)==g' CMakeLists.txt
sed -i 's=Catch2==g' tests/CMakeLists.txt
'';
nativeBuildInputs = [ cmake ];
buildInputs = [
vulkan-headers
glfw
catch2
patches = [
./0001-disable-fetch-content.patch
./0002-fix-install-tests.patch
];
nativeBuildInputs = [ cmake ];
buildInputs = [
vulkan-headers
];
checkInputs = [
glfw
catch2_3
];
doCheck = true;
cmakeFlags = [
"-DVK_BOOTSTRAP_VULKAN_HEADER_DIR=${vulkan-headers}/include"
"-DVK_BOOTSTRAP_INSTALL=1"
];
meta = {