From 625fa1c2703f86fdcd5864db546eaafe16589061 Mon Sep 17 00:00:00 2001 From: Erik Tollerud Date: Fri, 4 Apr 2025 08:31:38 -0400 Subject: [PATCH 1/2] freecad: enable netgen support netgen and the FEM plugin's use of it wasn't being built, causing the FEM plugin to fail (#382847). This commit explicitly turns on them on and adds netgen as a dependency. Co-authored-by: Michael Leuchtenburg --- pkgs/by-name/fr/freecad/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index cd3e21f4533d2..0f772a389cf2f 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -18,6 +18,7 @@ libXmu, medfile, mpi, + netgen, ninja, ode, opencascade-occt_7_6, @@ -78,6 +79,7 @@ freecad-utils.makeCustomizable ( [ cmake ninja + netgen pkg-config gfortran wrapGAppsHook3 @@ -104,6 +106,7 @@ freecad-utils.makeCustomizable ( matplotlib medfile mpi + netgen ode opencamlib pivy @@ -163,6 +166,9 @@ freecad-utils.makeCustomizable ( "-DBUILD_FLAT_MESH:BOOL=ON" "-DINSTALL_TO_SITEPACKAGES=OFF" "-DFREECAD_USE_PYBIND11=ON" + "-DBUILD_NETGEN=ON" + "-DBUILD_FEM_NETGEN=ON" + ] ++ lib.optionals (qtVersion == 5) [ "-DBUILD_QT5=ON" From 2485c747cc444bb13e98b004b0fac22244e61ee2 Mon Sep 17 00:00:00 2001 From: Erik Tollerud Date: Sun, 18 May 2025 22:16:48 -0400 Subject: [PATCH 2/2] freecad: update python packages to 3.12 the freecad python deps are based on the python nix package, which was updated to 3.12 but freecad's python deps were still 3.11. This commit updates the dependent packages to be for 3.12. --- pkgs/by-name/fr/freecad/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 0f772a389cf2f..e95edc9c7e911 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -24,7 +24,7 @@ opencascade-occt_7_6, opencascade-occt, pkg-config, - python311Packages, + python312Packages, spaceNavSupport ? stdenv.hostPlatform.isLinux, ifcSupport ? false, stdenv, @@ -40,7 +40,7 @@ qt6, }: let - inherit (python311Packages) + inherit (python312Packages) boost gitpython ifcopenshell