push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0089ee..eb1b1c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -459,13 +459,20 @@ endif()
# webm_parser headers are rooted at webm/.
set_target_properties(webm PROPERTIES PUBLIC_HEADER
"${webm_parser_public_headers}")
+target_include_directories(webm INTERFACE $<INSTALL_INTERFACE:include/webm>)
install(
TARGETS webm
+ EXPORT webmConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm)
+install(EXPORT webmConfig
+ FILE webmConfig.cmake
+ NAMESPACE webm::
+ DESTINATION lib/cmake/webm)
+
# Install common headers into a subdirectory to avoid breaking nested includes.
install(FILES ${libwebm_common_public_headers}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/common)

View File

@@ -0,0 +1,54 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libwebm";
version = "1.0.0.32";
src = fetchFromGitHub {
owner = "webmproject";
repo = "libwebm";
tag = "libwebm-${finalAttrs.version}";
hash = "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4=";
};
patches = [
# libwebm does not generate cmake exports by default,
# which are necessary to find and use it as build-dependency
# in other packages
./0001-cmake-exports.patch
];
nativeBuildInputs = [
cmake
];
outputs = [
"dev"
"out"
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^libwebm-(.+)$"
];
};
meta = {
description = "WebM file parser";
homepage = "https://www.webmproject.org/code/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ niklaskorz ];
platforms = lib.platforms.all;
};
})