diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-23 11:02:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-23 11:02:41 +0200 |
| commit | bb79a46357122714c60468a6ccc3522452145db7 (patch) | |
| tree | a0de6c4790a43220c66c832e8eebffe9ca9a57e7 /pkgs/applications/graphics/freecad | |
| parent | 794c91b49eba8e164a219ba85b19ef899502ba5b (diff) | |
| download | nixpkgs-bb79a46357122714c60468a6ccc3522452145db7.tar nixpkgs-bb79a46357122714c60468a6ccc3522452145db7.tar.gz nixpkgs-bb79a46357122714c60468a6ccc3522452145db7.tar.bz2 nixpkgs-bb79a46357122714c60468a6ccc3522452145db7.tar.lz nixpkgs-bb79a46357122714c60468a6ccc3522452145db7.tar.xz nixpkgs-bb79a46357122714c60468a6ccc3522452145db7.tar.zst nixpkgs-bb79a46357122714c60468a6ccc3522452145db7.zip | |
freecad: fix build
Diffstat (limited to 'pkgs/applications/graphics/freecad')
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 87565a1e53e..8001080a170 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { 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 , mpi ? null }: @@ -16,9 +16,18 @@ in stdenv.mkDerivation rec { sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; }; - buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c makeWrapper matplotlib mpi vtk hdf5 medfile - pycollada pyside pysideShiboken pysideTools pivy + buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts + zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile + ] ++ (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; |