diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2024-03-09 13:38:32 -0300 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2024-03-09 13:38:32 -0300 |
commit | f88b0e47f05428a5cdccd5dfc2ac461604aca92e (patch) | |
tree | 5234801dc95e83f8354fe9fbf680c3af31335306 /pkgs/applications/graphics | |
parent | 0db3bc9e5c5bf3f049260c2d426b3142a62fca8d (diff) | |
download | nixlib-f88b0e47f05428a5cdccd5dfc2ac461604aca92e.tar nixlib-f88b0e47f05428a5cdccd5dfc2ac461604aca92e.tar.gz nixlib-f88b0e47f05428a5cdccd5dfc2ac461604aca92e.tar.bz2 nixlib-f88b0e47f05428a5cdccd5dfc2ac461604aca92e.tar.lz nixlib-f88b0e47f05428a5cdccd5dfc2ac461604aca92e.tar.xz nixlib-f88b0e47f05428a5cdccd5dfc2ac461604aca92e.tar.zst nixlib-f88b0e47f05428a5cdccd5dfc2ac461604aca92e.zip |
freecad: prepare migration to by-name
- change libsForQt5.callPackage to callPackage - bring the libsForQt5 and python3Packages into the scope of expression
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 1ef114c9c496..436d94bd0f98 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,14 +1,10 @@ { lib -, fmt -, stdenv -, fetchFromGitHub , cmake -, doxygen -, ninja -, gitpython -, boost , coin3d +, doxygen , eigen +, fetchFromGitHub +, fmt , freecad # for passthru.tests , gfortran , gts @@ -17,38 +13,48 @@ , libXmu , libf2c , libredwg +, libsForQt5 , libspnav -, matplotlib , medfile , mpi +, ninja , ode , opencascade-occt -, pivy , pkg-config -, ply -, pycollada -, pyside2 -, pyside2-tools -, python -, pyyaml -, qtbase -, qttools -, qtwebengine -, qtx11extras -, qtxmlpatterns +, python3Packages , runCommand # for passthru.tests -, scipy -, shiboken2 -, soqt , spaceNavSupport ? stdenv.isLinux +, stdenv , swig , vtk -, wrapQtAppsHook , wrapGAppsHook , xercesc , zlib }: +let + boost = python3Packages.boost; + inherit (libsForQt5) + qtbase + qttools + qtwebengine + qtx11extras + qtxmlpatterns + soqt + wrapQtAppsHook; + inherit (python3Packages) + gitpython + matplotlib + pivy + ply + pycollada + pyside2 + pyside2-tools + python + pyyaml + scipy + shiboken2; +in stdenv.mkDerivation (finalAttrs: { pname = "freecad"; version = "0.21.2"; |