Merge staging-next into staging

2021-03-19 18:19:40 +00:00
parent 1a140c1e14 23c493eece
commit 6e3a55e059
33 changed files with 336 additions and 122 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"