freecad: 0.18.4 -> unstable-2020-09-25

This commit is contained in:
Gabriel Ebner 2020-09-26 12:08:13 +02:00
parent 650cb98140
commit 22301b66cd
2 changed files with 6 additions and 17 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook,
xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }:
@ -8,14 +8,14 @@ assert mpi != null;
let
pythonPackages = python3Packages;
in mkDerivation rec {
pname = "freecad";
version = "0.18.4";
pname = "freecad-unstable";
version = "2020-09-25";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = version;
sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s";
rev = "7616153b3c31ace006169cdc2fdafab484498858";
sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch";
};
nativeBuildInputs = [
@ -29,20 +29,11 @@ in mkDerivation rec {
buildInputs = [
cmake coin3d xercesc ode eigen opencascade-occt gts
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
libGLU libXmu qtbase qttools qtwebkit
libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
] ++ (with pythonPackages; [
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
]);
# Fix missing app icon on Wayland. Has been upstreamed and should be safe to
# remove in versions >= 0.19
patches = [
(fetchpatch {
url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch";
sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h";
})
];
cmakeFlags = [
"-DBUILD_QT5=ON"
"-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"

View file

@ -20803,8 +20803,6 @@ in
freecad = libsForQt514.callPackage ../applications/graphics/freecad {
mpi = openmpi;
# pyside2 5.12 is broken under python 3.8
python3Packages = python37Packages;
};
freemind = callPackage ../applications/misc/freemind {