nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

bambu-studio: 01.09.07.52 > 01.10.01.50

Browse Source 
(cherry picked from commit 1dd96bb0f4)
This commit is contained in:
liberodark 2024-11-17 10:35:09 +01:00 committed by github-actions[bot]
parent 7f21333d63
commit 34d12e4657
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/misc/bambu-studio/default.nix
View File

@ -8,11 +8,12 @@
wrapGAppsHook3,
boost180,
cereal,
cgal_5,
cgal,
curl,
dbus,
eigen,
expat,
ffmpeg,
gcc-unwrapped,
glew,
glfw,
@ -55,13 +56,13 @@ let
in
stdenv.mkDerivation rec {
pname = "bambu-studio";
version = "01.09.07.52";
version = "01.10.01.50";
src = fetchFromGitHub {
owner = "bambulab";
repo = "BambuStudio";
rev = "v${version}";
hash = "sha256-fhH4N29P/ysdHHbZt+FnBl3+QtTNhbVE3j4ZnFJyJH0=";
hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30=";
};
nativeBuildInputs = [
@ -74,11 +75,12 @@ stdenv.mkDerivation rec {
binutils
boost180
cereal
cgal_5
cgal
curl
dbus
eigen
expat
ffmpeg
gcc-unwrapped
glew
glfw
@ -109,8 +111,6 @@ stdenv.mkDerivation rec {
patches = [
# Fix for webkitgtk linking
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
# Fix build with cgal-5.6.1+
./patches/meshboolean-const.patch
# Fix an issue with
./patches/dont-link-opencv-world-bambu.patch
];
@ -149,6 +149,9 @@ stdenv.mkDerivation rec {
"-DSLIC3R_FHS=1"
"-DSLIC3R_GTK=3"
# Skips installing ffmpeg, since we BYO.
"-DFLATPAK=1"
# BambuStudio-specific
"-DBBL_RELEASE_TO_PUBLIC=1"
"-DBBL_INTERNAL_TESTING=0"

21
pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch
View File

@ -1,21 +0,0 @@
Fix build with cgal 5.6.1+
diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
index 50bbc099..b05245d3 100644
--- a/src/libslic3r/MeshBoolean.cpp
+++ b/src/libslic3r/MeshBoolean.cpp
@@ -200,12 +200,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh)
const auto &vertices = cgalmesh.vertices();
int vsize = int(vertices.size());
- for (auto &vi : vertices) {
+ for (const auto &vi : vertices) {
auto &v = cgalmesh.point(vi); // Don't ask...
its.vertices.emplace_back(to_vec3f(v));
}
- for (auto &face : faces) {
+ for (const auto &face : faces) {
auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face));
int i = 0;