freecad: python3, qt5, occt7

This commit is contained in:
Gabriel Ebner 2019-06-15 18:44:59 +02:00
parent 9a40e48d87
commit ad409cead6

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts { stdenv, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts
, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran , hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu
, soqt, libf2c, makeWrapper , soqt, libf2c, libGLU, makeWrapper, pkgconfig
, mpi ? null }: , mpi ? null }:
assert mpi != null; assert mpi != null;
let let
pythonPackages = python27Packages; pythonPackages = python3Packages;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "freecad-${version}"; name = "freecad-${version}";
version = "0.18.2"; version = "0.18.2";
@ -16,13 +16,27 @@ in stdenv.mkDerivation rec {
sha256 = "1r5rhaiq22yhrfpmcmzx6bflqj6q9asbyjyfja4x4rzfy9yh0a4v"; sha256 = "1r5rhaiq22yhrfpmcmzx6bflqj6q9asbyjyfja4x4rzfy9yh0a4v";
}; };
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts
] ++ (with pythonPackages; [ zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost 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 # This should work on both x86_64, and i686 linux
preBuild = '' preBuild = ''