mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
freecad: 0.19.1 -> 0.19.2
This commit is contained in:
parent
6358647558
commit
77447c96ca
@ -46,13 +46,13 @@
|
|||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "freecad";
|
pname = "freecad";
|
||||||
version = "0.19.1";
|
version = "0.19.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "FreeCAD";
|
owner = "FreeCAD";
|
||||||
repo = "FreeCAD";
|
repo = "FreeCAD";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ=";
|
hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -102,6 +102,7 @@ mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
"-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
|
||||||
"-DBUILD_FLAT_MESH:BOOL=ON"
|
"-DBUILD_FLAT_MESH:BOOL=ON"
|
||||||
"-DBUILD_QT5=ON"
|
"-DBUILD_QT5=ON"
|
||||||
"-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
|
"-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
|
||||||
@ -110,7 +111,7 @@ mkDerivation rec {
|
|||||||
+ ";${pyside2}/include/PySide2/QtCore"
|
+ ";${pyside2}/include/PySide2/QtCore"
|
||||||
+ ";${pyside2}/include/PySide2/QtWidgets"
|
+ ";${pyside2}/include/PySide2/QtWidgets"
|
||||||
+ ";${pyside2}/include/PySide2/QtGui"
|
+ ";${pyside2}/include/PySide2/QtGui"
|
||||||
)
|
)
|
||||||
"-DPYSIDE_LIBRARY=PySide2::pyside2"
|
"-DPYSIDE_LIBRARY=PySide2::pyside2"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user