@@ -1,48 +1,113 @@
1−{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
2−xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
3−opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
4−gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi,
5−spaceNavSupport ? true, libspnav, qtx11extras }:
1+{ lib
2+, mkDerivation
3+, fetchFromGitHub
4+, fetchpatch
5+, cmake
6+, ninja
7+, GitPython
8+, boost
9+, coin3d
10+, eigen
11+, gfortran
12+, gts
13+, hdf5
14+, libGLU
15+, libXmu
16+, libf2c
17+, libspnav
18+, matplotlib
19+, medfile
20+, mpi
21+, ode
22+, opencascade-occt
23+, pivy
24+, pkg-config
25+, pycollada
26+, pyside2
27+, pyside2-tools
28+, python
29+, pyyaml
30+, qtbase
31+, qttools
32+, qtwebengine
33+, qtx11extras
34+, qtxmlpatterns
35+, scipy
36+, shiboken2
37+, soqt
38+, spaceNavSupport ? true
39+, swig
40+, vtk
41+, wrapQtAppsHook
42+, xercesc
43+, zlib
44+}:
645
7−let
8− pythonPackages = python3Packages;
9−in mkDerivation rec {
10− pname = "freecad-unstable";
11− version = "2020-12-08";
46+mkDerivation rec {
47+ pname = "freecad";
48+ version = "0.19.1";
1249
1350 src = fetchFromGitHub {
1451 owner = "FreeCAD";
1552 repo = "FreeCAD";
16− rev = "daea30341ea2d5eaf2bfb65614128a5fa2abc8b7";
17− sha256 = "1fza64lygqq35v7kzgqmiq5dvl5rpgkhlzv06f9dszdz44hznina";
53+ rev = version;
54+ hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ=";
1855 };
1956
2057 nativeBuildInputs = [
2158 cmake
2259 ninja
2360 pkg-config
24− pythonPackages.pyside2-tools
61+ pyside2-tools
2562 wrapQtAppsHook
2663 ];
2764
2865 buildInputs = [
29− coin3d xercesc ode eigen opencascade-occt gts
30− zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
31− libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
32− ] ++ (with pythonPackages; [
33− matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
3466 GitPython # for addon manager
35− scipy pyyaml # (at least for) PyrateWorkbench
36− ]) ++ lib.optionals spaceNavSupport [ libspnav qtx11extras ];
67+ boost
68+ coin3d
69+ eigen
70+ gfortran
71+ gts
72+ hdf5
73+ libGLU
74+ libXmu
75+ libf2c
76+ matplotlib
77+ medfile
78+ mpi
79+ ode
80+ opencascade-occt
81+ pivy
82+ pycollada
83+ pyside2
84+ pyside2-tools
85+ python
86+ pyyaml # (at least for) PyrateWorkbench
87+ qtbase
88+ qttools
89+ qtwebengine
90+ qtxmlpatterns
91+ scipy
92+ shiboken2
93+ soqt
94+ swig
95+ vtk
96+ xercesc
97+ zlib
98+ ] ++ lib.optionals spaceNavSupport [
99+ libspnav
100+ qtx11extras
101+ ];
37102
38103 cmakeFlags = [
39104 "-DBUILD_QT5=ON"
40− "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"
105+ "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
41106 "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
42− ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include"
43− + ";${pythonPackages.pyside2}/include/PySide2/QtCore"
44− + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets"
45− + ";${pythonPackages.pyside2}/include/PySide2/QtGui"
107+ ("-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
108+ + ";${pyside2}/include/PySide2/QtCore"
109+ + ";${pyside2}/include/PySide2/QtWidgets"
110+ + ";${pyside2}/include/PySide2/QtGui"
46111 )
47112 "-DPYSIDE_LIBRARY=PySide2::pyside2"
48113 ];
@@ -68,10 +133,26 @@ in mkDerivation rec {
68133 '';
69134
70135 meta = with lib; {
71− description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
72136 homepage = "https://www.freecadweb.org/";
137+ description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
138+ longDescription = ''
139+ FreeCAD is an open-source parametric 3D modeler made primarily to design
140+ real-life objects of any size. Parametric modeling allows you to easily
141+ modify your design by going back into your model history and changing its
142+ parameters.
143+
144+ FreeCAD allows you to sketch geometry constrained 2D shapes and use them
145+ as a base to build other objects. It contains many components to adjust
146+ dimensions or extract design details from 3D models to create high quality
147+ production ready drawings.
148+
149+ FreeCAD is designed to fit a wide range of uses including product design,
150+ mechanical engineering and architecture. Whether you are a hobbyist, a
151+ programmer, an experienced CAD user, a student or a teacher, you will feel
152+ right at home with FreeCAD.
153+ '';
73154 license = licenses.lgpl2Plus;
74− maintainers = with maintainers; [ viric gebner ];
155+ maintainers = with maintainers; [ viric gebner AndersonTorres ];
75156 platforms = platforms.linux;
76157 };
77158}