diff --git a/pkgs/applications/misc/prusa-slicer/281-dependencies.patch b/pkgs/applications/misc/prusa-slicer/281-dependencies.patch deleted file mode 100644 index e677eb1d23b07..0000000000000 --- a/pkgs/applications/misc/prusa-slicer/281-dependencies.patch +++ /dev/null @@ -1,51 +0,0 @@ -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) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 6c4e9888d7d3a..97be42a3db5e1 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -66,32 +66,18 @@ let }); openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; }; wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; - - patches = [ - ./281-dependencies.patch - ]; in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.8.1"; - inherit patches; + version = "2.9.0"; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-nMLZvvZLIOChCLn8A9sOph1lqWsHb00eTG8z98/l0C8="; + hash = "sha256-6BrmTNIiu6oI/CbKPKoFQIh1aHEVfJPIkxomQou0xKk="; rev = "version_${finalAttrs.version}"; }; - # required for GCC 14 - # (not applicable to super-slicer fork) - postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") '' - substituteInPlace src/libslic3r/Arrange/Core/DataStoreTraits.hpp \ - --replace-fail \ - "WritableDataStoreTraits::template set" \ - "WritableDataStoreTraits::set" - ''; - nativeBuildInputs = [ cmake pkg-config