Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to latest master (2023-11-11), bump bambu-studio and begin aligning with prusa-slicer/default.nix #2

Closed
wants to merge 13 commits into from
Closed

Rebase to latest master (2023-11-11), bump bambu-studio and begin aligning with prusa-slicer/default.nix #2

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7421b26
wxGTK31: Support enabling WebRequest component
zhaofengli Jun 8, 2023
c4f640b
wxGTK31: Support enabling private fonts
zhaofengli Jun 8, 2023
5147dca
bambu-studio: init at 01.06.02.04
zhaofengli Jun 8, 2023
9c8d09d
bambu-studio: 01.06.02.04 -> 01.07.00.65
zhaofengli Jul 15, 2023
5092224
bambu-studio: 01.07.00.65 -> 01.07.06.92
zhaofengli Sep 25, 2023
a0dbc34
Switch to newer tbb version
Nov 11, 2023
a3e39ad
bambu-studio: 01.07.06.92 -> 01.08.00.57 (beta)
Nov 11, 2023
7db3baa
bambu-studio: switch to custom openvdb tbb version
Nov 11, 2023
b928ace
bambu-studio: chore update systemd include style
Nov 11, 2023
5c4b7a5
bambu-studio add boost filesystem workaround
Nov 11, 2023
1a1b0d7
Revert "bambu-studio add boost filesystem workaround"
Nov 26, 2023
a2e2c89
Downgrade boost to 179 (181 is current default)
Nov 26, 2023
65de34b
bambu-studio: bump to latest 01.08.00.62 beta
Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions pkgs/applications/misc/bambu-studio/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ stdenv
, lib
, openexr
, jemalloc
, c-blosc
, binutils
, fetchFromGitHub
, cmake
Expand Down Expand Up @@ -33,13 +36,12 @@
, openvdb
, pcre
, qhull
, systemd
, tbb_2021_8
, webkitgtk
, wxGTK31
, xorg
, fetchpatch
, withSystemd ? stdenv.isLinux
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
}:
let
wxGTK31' = wxGTK31.overrideAttrs (old: {
Expand All @@ -48,16 +50,19 @@ let
"--enable-debug=no"
];
});
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ];
});
in
stdenv.mkDerivation rec {
pname = "bambu-studio";
version = "01.07.06.92";
version = "01.08.00.57";

src = fetchFromGitHub {
owner = "bambulab";
repo = "BambuStudio";
rev = "v${version}";
hash = "sha256-6GpPBVPXPcdZ/YvG1RNaBS1DMNp7nbRH5IP1/Z4CJCc=";
hash = "sha256-yqn6248kdsxnVBevOca3LKZKicBF8cU+e/G5ynZK86k=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -92,7 +97,7 @@ stdenv.mkDerivation rec {
mpfr
nlopt
opencascade-occt
openvdb
openvdb_tbb_2021_8
pcre
tbb_2021_8
webkitgtk
Expand Down