public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freecad: 0.17 -> 0.18.1 (#59923) 

freecad: 0.17 -> 0.18.1
This commit is contained in:
Gabriel Ebner 2019-04-26 09:46:33 +02:00 committed by GitHub
parent 9b69cf0865 2d82f2edc5
commit 2f383a4469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/applications/graphics/freecad/default.nix
View File

@ -9,11 +9,11 @@ let
pythonPackages = python27Packages; pythonPackages = python27Packages;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "freecad-${version}"; name = "freecad-${version}";
version = "0.17"; version = "0.18.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; sha256 = "0lamrs84zv99v4z7yi6d9amjmnh7r6frairc2aajgfic380720bc";
}; };
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts
@ -22,14 +22,6 @@ in stdenv.mkDerivation rec {
matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost
]); ]);
patches = [
# Fix for finding boost_python. Boost >= 1.67.0 appends the Python version.
(fetchpatch {
url = https://github.com/FreeCAD/FreeCAD/commit/3c9e6b038ed544e446c61695dab62f83e781a28a.patch;
sha256 = "0f09qywzn0y41hylizb5g8jy74fi53iqmvqr5zznaz16wpw4hqbp";
})
];
enableParallelBuilding = true; enableParallelBuilding = true;
# This should work on both x86_64, and i686 linux # This should work on both x86_64, and i686 linux
@ -45,40 +37,8 @@ in stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
mkdir -p $out/share/mime/packages
cat << EOF > $out/share/mime/packages/freecad.xml
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-extension-fcstd">
<sub-class-of type="application/zip"/>
<comment>FreeCAD Document</comment>
<glob pattern="*.fcstd"/>
</mime-type>
</mime-info>
EOF
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications/
for entry in $out/share/applications/*.desktop; do
substituteAllInPlace $entry
done
''; '';
desktopItem = makeDesktopItem {
name = "freecad";
desktopName = "FreeCAD";
genericName = "CAD Application";
comment = meta.description;
exec = "@out@/bin/FreeCAD %F";
categories = "Science;Education;Engineering;";
startupNotify = "true";
mimeType = "application/x-extension-fcstd;";
extraEntries = ''
Path=@out@/share/freecad
'';
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
homepage = https://www.freecadweb.org/; homepage = https://www.freecadweb.org/;