freecad: enable ifc unconditionally

closes #370121

follow-up to #330190

The BIM workspace depends on ifc, there is little reason
why it should be conditional to a flag that causes a
from-source rebuild. It should just be always enabled.

(cherry picked from commit f772e38)

Author: LordGrimmauld

pkgs/by-name/fr/freecad/package.nix

@@ -25,7 +25,7 @@
   pkg-config,
   python3Packages,
   spaceNavSupport ? stdenv.hostPlatform.isLinux,
-  ifcSupport ? false,
+  ifcSupport ? false, # Now a no-op, retained on 25.05 branch for backport compat.
   stdenv,
   swig,
   vtk,
@@ -40,30 +40,26 @@
   nix-update-script,
 }:
 let
-  pythonDeps =
-    with python3Packages;
-    [
-      boost
-      gitpython # for addon manager
-      matplotlib
-      opencamlib
-      pivy
-      ply # for openSCAD file support
-      py-slvs
-      pybind11
-      pycollada
-      pyside2
-      pyside2-tools
-      pyside6
-      python
-      pyyaml # (at least for) PyrateWorkbench
-      scipy
-      shiboken2
-      shiboken6
-    ]
-    ++ lib.optionals ifcSupport [
-      ifcopenshell
-    ];
+  pythonDeps = with python3Packages; [
+    boost
+    gitpython # for addon manager
+    ifcopenshell
+    matplotlib
+    opencamlib
+    pivy
+    ply # for openSCAD file support
+    py-slvs
+    pybind11
+    pycollada
+    pyside2
+    pyside2-tools
+    pyside6
+    python
+    pyyaml # (at least for) PyrateWorkbench
+    scipy
+    shiboken2
+    shiboken6
+  ];
 
   freecad-utils = callPackage ./freecad-utils.nix { };
 in
@@ -90,7 +86,7 @@ freecad-utils.makeCustomizable (
       wrapGAppsHook3
     ]
     ++ lib.optionals (qtVersion == 5) [
-      pyside2-tools
+      python3Packages.pyside2-tools
       qt5.wrapQtAppsHook
     ]
     ++ lib.optionals (qtVersion == 6) [ qt6.wrapQtAppsHook ];
@@ -114,9 +110,9 @@ freecad-utils.makeCustomizable (
     ++ lib.optionals (qtVersion == 5) [
       libsForQt5.soqt
       opencascade-occt_7_6
-      pyside2
-      pyside2-tools
-      shiboken2
+      python3Packages.pyside2
+      python3Packages.pyside2-tools
+      python3Packages.shiboken2
       qt5.qtbase
       qt5.qttools
       qt5.qtwayland
@@ -162,13 +158,13 @@ freecad-utils.makeCustomizable (
     ]
     ++ lib.optionals (qtVersion == 5) [
       "-DBUILD_QT5=ON"
-      "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
+      "-DSHIBOKEN_INCLUDE_DIR=${python3Packages.shiboken2}/include"
       "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
       (
-        "-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
-        + ";${pyside2}/include/PySide2/QtCore"
-        + ";${pyside2}/include/PySide2/QtWidgets"
-        + ";${pyside2}/include/PySide2/QtGui"
+        "-DPYSIDE_INCLUDE_DIR=${python3Packages.pyside2}/include"
+        + ";${python3Packages.pyside2}/include/PySide2/QtCore"
+        + ";${python3Packages.pyside2}/include/PySide2/QtWidgets"
+        + ";${python3Packages.pyside2}/include/PySide2/QtGui"
       )
       "-DPYSIDE_LIBRARY=PySide2::pyside2"
     ]

pkgs/by-name/fr/freecad/tests/default.nix

@@ -1,9 +1,7 @@
 {
   callPackage,
-  freecad,
 }:
 {
   python-path = callPackage ./python-path.nix { };
   modules = callPackage ./modules.nix { };
-  withIfcSupport = freecad.override { ifcSupport = true; };
 }