freecad: fix build

This commit is contained in:
Frederik Rietdijk 2018-06-23 11:02:23 +02:00
parent 794c91b49e
commit bb79a46357

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran , hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran, fetchpatch
, soqt, libf2c, makeWrapper, makeDesktopItem , soqt, libf2c, makeWrapper, makeDesktopItem
, mpi ? null }: , mpi ? null }:
@ -16,9 +16,18 @@ in stdenv.mkDerivation rec {
sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df";
}; };
buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts
zlib python swig gfortran soqt libf2c makeWrapper matplotlib mpi vtk hdf5 medfile zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
pycollada pyside pysideShiboken pysideTools pivy ] ++ (with pythonPackages; [
matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost
]);
patches = [
# Fix for finding boost_python. Boost >= 1.67.0 appends the Python version.
(fetchpatch {
url = https://github.com/FreeCAD/FreeCAD/commit/3c9e6b038ed544e446c61695dab62f83e781a28a.patch;
sha256 = "0f09qywzn0y41hylizb5g8jy74fi53iqmvqr5zznaz16wpw4hqbp";
})
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;