From c002f9ae8dd52d847915c71838007f11d279fe5b Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 30 Jun 2025 23:30:17 +0800 Subject: [PATCH 1/2] freecad: remove duplicated cmakeFlag --- pkgs/by-name/fr/freecad/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 384a2fd97d8f..2c4dcd465b80 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -123,7 +123,6 @@ freecad-utils.makeCustomizable ( cmakeFlags = [ "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on - "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_DRAWING=ON" "-DBUILD_FLAT_MESH:BOOL=ON" "-DINSTALL_TO_SITEPACKAGES=OFF" From 51fb016f9d7096334a7f1a6a007c94c7746aca8e Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 30 Jun 2025 23:34:15 +0800 Subject: [PATCH 2/2] freecad: fix build with vtk 9.5 --- pkgs/by-name/fr/freecad/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 2c4dcd465b80..926876295c45 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -119,6 +119,11 @@ freecad-utils.makeCustomizable ( url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1"; hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c="; }) + # https://github.com/FreeCAD/FreeCAD/pull/22221 + (fetchpatch { + url = "https://github.com/FreeCAD/FreeCAD/commit/3d2b7dc9c7ac898b30fe469b7cbd424ed1bca0a2.patch?full_index=1"; + hash = "sha256-XCQdv/+dYdJ/ptA2VKrD63qYILyaP276ISMkmWLtT30="; + }) ]; cmakeFlags = [