Unverified Commit a0b2f3b5 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

bambu-studio: 01.09.00.70 -> 01.09.07.52 (#348091)

parents 85455bbc 4117c7f7

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -5868,6 +5868,12 @@ 
    githubId = 1931963;

    name = "David Sferruzza";

  };

  dsluijk = {

    name = "Dany Sluijk";

    email = "nix@dany.dev";

    github = "dsluijk";

    githubId = 8537327;

  };

  dstengele = {

    name = "Dennis Stengele";

    email = "dennis@stengele.me";

pkgs/applications/misc/bambu-studio/default.nix

+39 −25
Original line number Diff line number Diff line
@@ -22,10 +22,7 @@ 
  glib,

  glib-networking,

  gmp,

  gstreamer,

  gst-plugins-base,

  gst-plugins-bad,

  gst-plugins-good,

  gst_all_1,

  gtest,

  gtk3,

  hicolor-icon-theme,
@@ -36,6 +33,7 @@ 
  nlopt,

  opencascade-occt_7_6,

  openvdb,

  opencv,

  pcre,

  systemd,

  tbb_2021_11,
@@ -45,14 +43,20 @@ 
  withSystemd ? stdenv.hostPlatform.isLinux,

}:

let

  opencascade-occt = opencascade-occt_7_6;

  wxGTK31' = wxGTK31.overrideAttrs (old: {

  wxGTK' =

    (wxGTK31.override {

      withCurl = true;

      withPrivateFonts = true;

      withWebKit = true;

    }).overrideAttrs

      (old: {

        configureFlags = old.configureFlags ++ [

          # Disable noisy debug dialogs

          "--enable-debug=no"

        ];

      });

  openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: {



  openvdb' = openvdb.overrideAttrs (old: {

    buildInputs = [

      openexr

      boost179
@@ -65,13 +69,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "bambu-studio";

  version = "01.09.00.70";

  version = "01.09.07.52";



  src = fetchFromGitHub {

    owner = "bambulab";

    repo = "BambuStudio";

    rev = "v${version}";

    hash = "sha256-RBctBhKo7mjxsP7OJhGfoU1eIiGVuMiAqwwSU+gsMds=";

    hash = "sha256-fhH4N29P/ysdHHbZt+FnBl3+QtTNhbVE3j4ZnFJyJH0=";

  };



  nativeBuildInputs = [
@@ -95,10 +99,10 @@ stdenv.mkDerivation rec { 
    glib

    glib-networking

    gmp

    gstreamer

    gst-plugins-base

    gst-plugins-bad

    gst-plugins-good

    gst_all_1.gstreamer

    gst_all_1.gst-plugins-base

    gst_all_1.gst-plugins-bad

    gst_all_1.gst-plugins-good

    gtk3

    hicolor-icon-theme

    ilmbase
@@ -106,20 +110,23 @@ stdenv.mkDerivation rec { 
    mesa.osmesa

    mpfr

    nlopt

    opencascade-occt

    openvdb_tbb_2021_8

    opencascade-occt_7_6

    openvdb'

    pcre

    tbb_2021_11

    webkitgtk_4_0

    wxGTK31'

    wxGTK'

    xorg.libX11

    opencv

  ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;



  patches = [

    # Fix for webkitgtk linking

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

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

    # Fix build with cgal-5.6.1+

    ./meshboolean-const.patch

    ./patches/meshboolean-const.patch

    # Fix an issue with

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

  ];



  doCheck = true;
@@ -136,7 +143,10 @@ stdenv.mkDerivation rec { 
  # Disable compiler warnings that clutter the build log.

  # It seems to be a known issue for Eigen:

  # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221

  NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";

  NIX_CFLAGS_COMPILE = toString [

    "-Wno-ignored-attributes"

    "-I${opencv.out}/include/opencv4"

  ];



  # prusa-slicer uses dlopen on `libudev.so` at runtime

  NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";
@@ -181,8 +191,12 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "PC Software for BambuLab's 3D printers";

    homepage = "https://github.com/bambulab/BambuStudio";

    changelog = "https://github.com/bambulab/BambuStudio/releases/tag/v${version}";

    license = licenses.agpl3Plus;

    maintainers = with maintainers; [ zhaofengli ];

    maintainers = with maintainers; [

      zhaofengli

      dsluijk

    ];

    mainProgram = "bambu-studio";

    platforms = platforms.linux;

  };

pkgs/applications/misc/bambu-studio/orca-slicer.nix

+9 −15
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  fetchFromGitHub,

  bambu-studio,

  opencv,

}:

bambu-studio.overrideAttrs (

  finalAttrs: previousAttrs: {
@@ -16,19 +15,14 @@ bambu-studio.overrideAttrs ( 
      hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk=";

    };



    patches =

      previousAttrs.patches

      ++ [

    patches =[

      # FIXME: only required for 2.1.1, can be removed in the next version

        ./0002-fix-build-for-gcc-13.diff



        ./dont-link-opencv-world.patch

      ];



    buildInputs =

      previousAttrs.buildInputs

      ++ [

        opencv

      ./patches/0002-fix-build-for-gcc-13.diff

      # 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

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

    ];



    preFixup = ''

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

+0 −0

File moved.

View file