diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/freecad/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/graphics/freecad/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 440cc7fa38df..ac4050fc8c5b 100644 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -23,6 +23,7 @@ , opencascade-occt , pivy , pkg-config +, ply , pycollada , pyside2 , pyside2-tools @@ -46,13 +47,13 @@ mkDerivation rec { pname = "freecad"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ="; + hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU="; }; nativeBuildInputs = [ @@ -80,6 +81,7 @@ mkDerivation rec { ode opencascade-occt pivy + ply # for openSCAD file support pycollada pyside2 pyside2-tools @@ -102,6 +104,7 @@ mkDerivation rec { ]; cmakeFlags = [ + "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_QT5=ON" "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include" @@ -110,7 +113,7 @@ mkDerivation rec { + ";${pyside2}/include/PySide2/QtCore" + ";${pyside2}/include/PySide2/QtWidgets" + ";${pyside2}/include/PySide2/QtGui" - ) + ) "-DPYSIDE_LIBRARY=PySide2::pyside2" ]; |