diff --git a/pkgs/by-name/ta/taskflow/add-pkg-config-support.patch b/pkgs/by-name/ta/taskflow/add-pkg-config-support.patch new file mode 100644 index 000000000000..3eb447d6d3bb --- /dev/null +++ b/pkgs/by-name/ta/taskflow/add-pkg-config-support.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 063fd793..99998a6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -377,3 +377,13 @@ install( + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) + ++ ++# ----------------------------------------------------------------------------- ++# pkg-config ++# ----------------------------------------------------------------------------- ++ ++configure_file(taskflow.pc.in taskflow.pc @ONLY) ++install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/taskflow.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++) +diff --git a/taskflow.pc.in b/taskflow.pc.in +new file mode 100644 +index 00000000..fc649288 +--- /dev/null ++++ b/taskflow.pc.in +@@ -0,0 +1,7 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++ ++Name: Taskflow ++Description: A General-purpose Task-parallel Programming System ++Version: @PROJECT_VERSION@ ++Cflags: -I${includedir} diff --git a/pkgs/by-name/ta/taskflow/package.nix b/pkgs/by-name/ta/taskflow/package.nix index 14e3cb8176e2..65471bef8a46 100644 --- a/pkgs/by-name/ta/taskflow/package.nix +++ b/pkgs/by-name/ta/taskflow/package.nix @@ -2,6 +2,7 @@ cmake, doctest, fetchFromGitHub, + fetchpatch, lib, replaceVars, stdenv, @@ -22,6 +23,19 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./unvendor-doctest.patch { inherit doctest; }) + + # https://github.com/taskflow/taskflow/pull/785 + # TODO: remove when updating to the next release + (fetchpatch { + name = "fix-brace-init-with-explicit-constructor-for-GCC-15"; + url = "https://github.com/taskflow/taskflow/commit/de7dfe30594cd1f98398095b970a8320734a2382.patch"; + hash = "sha256-Ecl7dFvf2HDslv/5IHR5J2PYcRCN3EA4GahxOzcUS4g="; + }) + + # Vendored from #786 as it does not apply cleanly on top of v0.4.0 + # https://github.com/taskflow/taskflow/pull/786 + # TODO: remove when updating to the next release + ./add-pkg-config-support.patch ]; postPatch = ''