diff options
author | Gabriel Ebner <gebner@gebner.org> | 2019-06-15 18:44:59 +0200 |
---|---|---|
committer | Gabriel Ebner <gebner@gebner.org> | 2019-06-17 18:40:51 +0200 |
commit | ad409cead6f9e51943daf5f02f1b78c7699ce728 (patch) | |
tree | 9a23248c8aa2d68f220ff30d45f314c523a54a31 /pkgs/applications/graphics | |
parent | 9a40e48d87a07da2d7770e31caf475ea64c161d2 (diff) | |
download | nixlib-ad409cead6f9e51943daf5f02f1b78c7699ce728.tar nixlib-ad409cead6f9e51943daf5f02f1b78c7699ce728.tar.gz nixlib-ad409cead6f9e51943daf5f02f1b78c7699ce728.tar.bz2 nixlib-ad409cead6f9e51943daf5f02f1b78c7699ce728.tar.lz nixlib-ad409cead6f9e51943daf5f02f1b78c7699ce728.tar.xz nixlib-ad409cead6f9e51943daf5f02f1b78c7699ce728.tar.zst nixlib-ad409cead6f9e51943daf5f02f1b78c7699ce728.zip |
freecad: python3, qt5, occt7
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 130e8255aa36..8fc39ded6383 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran -, soqt, libf2c, makeWrapper +{ stdenv, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts +, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu +, soqt, libf2c, libGLU, makeWrapper, pkgconfig , mpi ? null }: assert mpi != null; let - pythonPackages = python27Packages; + pythonPackages = python3Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; version = "0.18.2"; @@ -16,13 +16,27 @@ in stdenv.mkDerivation rec { sha256 = "1r5rhaiq22yhrfpmcmzx6bflqj6q9asbyjyfja4x4rzfy9yh0a4v"; }; - buildInputs = [ 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 + nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; + buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts + zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile + libGLU libXmu + ] ++ (with qt5; [ + qtbase qttools qtwebkit + ]) ++ (with pythonPackages; [ + matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost ]); - enableParallelBuilding = true; + cmakeFlags = [ + "-DBUILD_QT5=ON" + "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" + "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" + ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include" + + ";${pythonPackages.pyside2}/include/PySide2/QtCore" + + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets" + + ";${pythonPackages.pyside2}/include/PySide2/QtGui" + ) + "-DPYSIDE_LIBRARY=PySide2::pyside2" + ]; # This should work on both x86_64, and i686 linux preBuild = '' @@ -42,7 +56,7 @@ in stdenv.mkDerivation rec { postFixup = '' mv $out/share/doc $out ''; - + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; homepage = https://www.freecadweb.org/; |