From 994d64a73236839d4dc08983644620779d5b1b65 Mon Sep 17 00:00:00 2001
From: Wulfsta <wulfstawulfsta@gmail.com>
Date: Sat, 16 Jul 2022 21:19:26 -0400
Subject: [PATCH] super-slicer-latest: 2.3.57.12 -> 2.4.58.3

---
 .../misc/prusa-slicer/super-slicer.nix        | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
index 742fa6f8e20e..b385542d679a 100644
--- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix
+++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -1,16 +1,35 @@
-{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }:
+{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }:
 let
   appname = "SuperSlicer";
   pname = "super-slicer";
   description = "PrusaSlicer fork with more features and faster development cycle";
 
   versions = {
-    stable = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; };
-    latest = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; };
+    stable = {
+      version = "2.3.57.12";
+      sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw==";
+      patches = null;
+    };
+    latest = {
+      version = "2.4.58.3";
+      sha256 = "sha256-pEZcBEvK4Mq8nytiXLJvta7Bk6qZRJfTNrYz7N/aUAE=";
+      patches = [
+        # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355
+        (fetchpatch {
+          url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
+          sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
+        })
+        # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823
+        (fetchpatch {
+          url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch";
+          sha256 = "sha256-xMbUjumPZ/7ulyRuBA76CwIv4BOpd+yKXCINSf58FxI=";
+        })
+      ];
+    };
   };
 
-  override = { version, sha256 }: super: {
-    inherit version pname;
+  override = { version, sha256, patches }: super: {
+    inherit version pname patches;
 
     src = fetchFromGitHub {
       owner = "supermerill";
@@ -20,8 +39,6 @@ let
       fetchSubmodules = true;
     };
 
-    patches = null;
-
     # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.
     postInstall = null;
     separateDebugInfo = true;