diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index d517306c1d6..87565a1e53e 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }: +, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran +, soqt, libf2c, makeWrapper, makeDesktopItem +, mpi ? null }: + +assert mpi != null; let pythonPackages = python27Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.16.6712"; + version = "0.17"; src = fetchurl { url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "14hs26gvv7gbg9misxq34v4nrds2sbxjhj4yyw5kq3zbvl517alp"; + sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; }; buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c makeWrapper matplotlib + zlib python swig gfortran soqt libf2c makeWrapper matplotlib mpi vtk hdf5 medfile pycollada pyside pysideShiboken pysideTools pivy ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0ac1fcd3d0..eb4f6d901f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16021,7 +16021,7 @@ with pkgs; fomp = callPackage ../applications/audio/fomp { }; - freecad = callPackage ../applications/graphics/freecad { }; + freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { };