Merge pull request #72711 from gebner/freecad0184

freecad: 0.18.3 -> 0.18.4
This commit is contained in:
Gabriel Ebner 2019-11-03 14:45:40 +01:00 committed by GitHub
commit 8821d1f68f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode
, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile
, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU
, makeWrapper, pkgconfig, mpi ? null }:
@ -9,11 +9,13 @@ let
pythonPackages = python3Packages;
in mkDerivation rec {
pname = "freecad";
version = "0.18.3";
version = "0.18.4";
src = fetchurl {
url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
sha256 = "07j7azgnicmd8cqnyskp15y44ykgj5qqz5y3w1jdynrv3yrvk1kz";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = version;
sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s";
};
nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];