prusa-slicer: 2.8.0 -> 2.8.1

pkgs/applications/misc/prusa-slicer/281-dependencies.patch

@@ -0,0 +1,51 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 31cb4c0ff..42c38102c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -247,6 +247,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     find_package(Threads REQUIRED)
+
+     find_package(DBus REQUIRED)
++    pkg_check_modules(DBUS REQUIRED dbus-1)
++    include_directories(${DBUS_INCLUDE_DIRS})
+ endif()
+
+ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
+@@ -371,10 +373,13 @@ endif()
+ # boost::process was introduced first in version 1.64.0,
+ # boost::beast::detail::base64 was introduced first in version 1.66.0
+ set(MINIMUM_BOOST_VERSION "1.66.0")
+-set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
++# set(Boost_USE_STATIC_LIBS ON)
++find_package(Boost REQUIRED COMPONENTS log)
++set(_boost_components "system;filesystem;thread;log;log_setup;locale;regex;chrono;atomic;date_time;iostreams;nowide")
+ find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
++include_directories(${BOOST_INCLUDE_DIRS})
+
+-find_package(Eigen3 3.3.7 REQUIRED)
++find_package(Eigen3 3.3.7 REQUIRED NO_MODULE)
+
+ add_library(boost_libs INTERFACE)
+ add_library(boost_headeronly INTERFACE)
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 78369233d..1f9c40aaf 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES
+ )
+
+ find_package(NanoSVG REQUIRED)
++find_package(OpenSSL REQUIRED)
+
+ if (APPLE)
+     list(APPEND SLIC3R_GUI_SOURCES
+@@ -438,6 +439,9 @@ target_link_libraries(
+     NanoSVG::nanosvgrast
+     stb_dxt
+     fastfloat
++    Boost::log
++    OpenSSL::SSL
++    OpenSSL::Crypto
+ )
+
+ if (MSVC)

pkgs/applications/misc/prusa-slicer/default.nix

@@ -25,7 +25,7 @@
 , mpfr
 , nanosvg
 , nlopt
-, opencascade-occt_7_6
+, opencascade-occt_7_6_1
 , openvdb
 , pcre
 , qhull
@@ -35,11 +35,11 @@
 , libbgcode
 , heatshrink
 , catch2
+, webkitgtk_4_0
 , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
 , wxGTK-override ? null
 }:
 let
-  opencascade-occt = opencascade-occt_7_6;
   wxGTK-prusa = wxGTK32.overrideAttrs (old: rec {
     pname = "wxwidgets-prusa3d-patched";
     version = "3.2.0";
@@ -68,25 +68,18 @@ let
   wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
 
   patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/gentoo/gentoo/master/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch";
-      hash = "sha256-/R9jv9zSP1lDW6IltZ8V06xyLdxfaYrk3zD6JRFUxHg=";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/gentoo/gentoo/master/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch";
-      hash = "sha256-G1JNdVH+goBelag9aX0NctHFVqtoYFnqjwK/43FVgvM=";
-    })
+    ./281-dependencies.patch
   ];
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prusa-slicer";
-  version = "2.8.0";
+  version = "2.8.1";
   inherit patches;
 
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "PrusaSlicer";
-    hash = "sha256-A/uxNIEXCchLw3t5erWdhqFAeh6nudcMfASi+RoJkFg=";
+    hash = "sha256-nMLZvvZLIOChCLn8A9sOph1lqWsHb00eTG8z98/l0C8=";
     rev = "version_${finalAttrs.version}";
   };
 
@@ -116,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     mpfr
     nanosvg-fltk
     nlopt
-    opencascade-occt
+    opencascade-occt_7_6_1
     openvdb_tbb_2021_8
     pcre
     qhull
@@ -126,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     libbgcode
     heatshrink
     catch2
+    webkitgtk_4_0
   ] ++ lib.optionals withSystemd [
     systemd
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -173,6 +167,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DSLIC3R_STATIC=0"
     "-DSLIC3R_FHS=1"
     "-DSLIC3R_GTK=3"
+    "-DSLIC3R_BUILD_TESTS=0"
+    "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK"
   ];
 
   postInstall = ''

pkgs/top-level/all-packages.nix

@@ -10571,6 +10571,17 @@ with pkgs;
     ];
   };
 
+  opencascade-occt_7_6_1 = opencascade-occt.overrideAttrs {
+    pname = "opencascade-occt";
+    version = "7.6.1";
+    src = fetchFromGitHub {
+      owner = "Open-Cascade-SAS";
+      repo = "OCCT";
+      rev = "V7_6_1";
+      sha256 = "sha256-C02P3D363UwF0NM6R4D4c6yE5ZZxCcu5CpUaoTOxh7E=";
+    };
+  };
+
   opencsg = callPackage ../development/libraries/opencsg {
     inherit (qt5) qmake;
     inherit (darwin.apple_sdk.frameworks) GLUT;