Unverified Commit 0a92232f authored by Emily's avatar Emily Committed by GitHub
Browse files

bambu-studio: 01.09.07.52 > 01.10.01.50 (#356673)

parents 6d86d77a 498c93d3

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

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
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;

pkgs/applications/misc/bambu-studio/default.nix→pkgs/by-name/ba/bambu-studio/package.nix

+9 −6
Original line number Diff line number Diff line
@@ -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"

pkgs/applications/misc/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch→pkgs/by-name/ba/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch

+0 −0

File moved.

View file

pkgs/applications/misc/bambu-studio/orca-slicer.nix→pkgs/by-name/or/orca-slicer/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ bambu-studio.overrideAttrs ( 
    patches = [

      # Fix for webkitgtk linking

      ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch



      ./patches/dont-link-opencv-world-orca.patch

    ];