From f772e38277b387b1e225987fb84ed61af38174b3 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 5 Jul 2025 12:01:32 +0200 Subject: [PATCH] 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. --- pkgs/by-name/fr/freecad/package.nix | 39 ++++++++++------------- pkgs/by-name/fr/freecad/tests/default.nix | 2 -- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 384a2fd97d8f..61a1630e2f39 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -23,7 +23,6 @@ pkg-config, python3Packages, spaceNavSupport ? stdenv.hostPlatform.isLinux, - ifcSupport ? false, stdenv, swig, vtk, @@ -35,27 +34,23 @@ nix-update-script, }: let - pythonDeps = - with python3Packages; - [ - boost - gitpython # for addon manager - matplotlib - opencamlib - pivy - ply # for openSCAD file support - py-slvs - pybind11 - pycollada - pyside6 - python - pyyaml # (at least for) PyrateWorkbench - scipy - 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 + pyside6 + python + pyyaml # (at least for) PyrateWorkbench + scipy + shiboken6 + ]; freecad-utils = callPackage ./freecad-utils.nix { }; in diff --git a/pkgs/by-name/fr/freecad/tests/default.nix b/pkgs/by-name/fr/freecad/tests/default.nix index 954aadaf17ff..26fa5db07640 100644 --- a/pkgs/by-name/fr/freecad/tests/default.nix +++ b/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; }; }