From 405bc0e9e6a87e92326a5fc16b4b0d24e31d7e87 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Wed, 25 Feb 2026 18:08:04 +0800 Subject: [PATCH] freecad: fix build for boost 1.89 --- .../freecad/0004-FreeCad-fix-boost-189-build.patch | 13 +++++++++++++ pkgs/by-name/fr/freecad/package.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/fr/freecad/0004-FreeCad-fix-boost-189-build.patch diff --git a/pkgs/by-name/fr/freecad/0004-FreeCad-fix-boost-189-build.patch b/pkgs/by-name/fr/freecad/0004-FreeCad-fix-boost-189-build.patch new file mode 100644 index 000000000000..074933ce0fa7 --- /dev/null +++ b/pkgs/by-name/fr/freecad/0004-FreeCad-fix-boost-189-build.patch @@ -0,0 +1,13 @@ +diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake b/cMake/FreeCAD_Helpers/SetupBoost.cmake +index 0bb1343..1a389bf 100644 +--- a/cMake/FreeCAD_Helpers/SetupBoost.cmake ++++ b/cMake/FreeCAD_Helpers/SetupBoost.cmake +@@ -3,7 +3,7 @@ macro(SetupBoost) + + set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS}) + +- set (BOOST_COMPONENTS filesystem program_options regex system thread date_time) ++ set (BOOST_COMPONENTS filesystem program_options regex thread date_time) + find_package(Boost ${BOOST_MIN_VERSION} + COMPONENTS ${BOOST_COMPONENTS} REQUIRED) + diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 9bee57d7e7fd..8004f87368ae 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -104,6 +104,11 @@ freecad-utils.makeCustomizable ( # https://github.com/FreeCAD/FreeCAD/pull/21710 ./0003-FreeCad-fix-font-load-crash.patch + + # Fix build for boost 1.89 or later, remove once FreeCad 1.1 is released + # based on https://github.com/FreeCAD/FreeCAD/commit/0f6d00d2a547df0f5c2ba5ef0f79044a49b0a2d + ./0004-FreeCad-fix-boost-189-build.patch + (fetchpatch { url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1"; hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";