Merge pull request #100972 from gebner/freecadgitpython
This commit is contained in:
Gabriel Ebner
GitHub
commit
7caa81d8a2
@ -9,13 +9,13 @@ let
|
||||
pythonPackages = python3Packages;
|
||||
in mkDerivation rec {
|
||||
pname = "freecad-unstable";
|
||||
version = "2020-09-25";
|
||||
version = "2020-10-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
rev = "7616153b3c31ace006169cdc2fdafab484498858";
|
||||
sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch";
|
||||
rev = "f3bdaaa55a6c03b297924c40819d23e4603fa55b";
|
||||
sha256 = "1q1iy4i9k65v8z7h8a6r4bf5ycn124jp26xwp0xwbar4gnkx2jiq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -32,6 +32,7 @@ in mkDerivation rec {
|
||||
libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
|
||||
] ++ (with pythonPackages; [
|
||||
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
|
||||
GitPython # for addon manager
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
|
||||
xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook,
|
||||
opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
|
||||
gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }:
|
||||
|
||||
assert mpi != null;
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages;
|
||||
in mkDerivation rec {
|
||||
pname = "freecad";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
rev = version;
|
||||
sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkgconfig
|
||||
pythonPackages.pyside2-tools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmake coin3d xercesc ode eigen opencascade-occt gts
|
||||
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
|
||||
libGLU libXmu qtbase qttools qtwebkit
|
||||
] ++ (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"
|
||||
"-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 = ''
|
||||
export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
|
||||
'';
|
||||
|
||||
# Their main() removes PYTHONPATH=, and we rely on it.
|
||||
preConfigure = ''
|
||||
sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp
|
||||
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
|
||||
'';
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
|
||||
];
|
||||
|
||||
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/";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ viric gebner ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk,
|
||||
libGL, libGLU, libXext, libXmu, libXi, darwin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencascade-occt";
|
||||
version = "7.3.0p3";
|
||||
commit = "V${builtins.replaceStrings ["."] ["_"] version}";
|
||||
|
||||
src = fetchurl {
|
||||
name = "occt-${commit}.tar.gz";
|
||||
url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
|
||||
sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
|
||||
homepage = "https://www.opencascade.org/";
|
||||
license = licenses.lgpl21; # essentially...
|
||||
# The special exception defined in the file OCCT_LGPL_EXCEPTION.txt
|
||||
# are basically about making the license a little less share-alike.
|
||||
maintainers = with maintainers; [ amiloradovsky ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
@ -14707,7 +14707,6 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa;
|
||||
};
|
||||
opencascade-occt = callPackage ../development/libraries/opencascade-occt { };
|
||||
opencascade-occt730 = callPackage ../development/libraries/opencascade-occt/7.3.nix { };
|
||||
|
||||
opencl-headers = callPackage ../development/libraries/opencl-headers { };
|
||||
|
||||
@ -20846,11 +20845,6 @@ in
|
||||
freecad = libsForQt5.callPackage ../applications/graphics/freecad {
|
||||
mpi = openmpi;
|
||||
};
|
||||
freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix {
|
||||
mpi = openmpi;
|
||||
opencascade-occt = opencascade-occt730;
|
||||
python3Packages = python37Packages;
|
||||
};
|
||||
|
||||
freemind = callPackage ../applications/misc/freemind {
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
|
||||
Loading…
Reference in New Issue
Block a user