Merge master into staging-next

2021-03-19 18:17:01 +01:00
parent c804f22a81 fe7df3f3ff
commit 1ecb97eae9
22 changed files with 108 additions and 49 deletions
@@ -101,6 +101,7 @@ mkDerivation rec {
  ];

  cmakeFlags = [
+    "-DBUILD_FLAT_MESH:BOOL=ON"
    "-DBUILD_QT5=ON"
    "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
    "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"