prusa-slicer: 2.8.1 -> 2.9.0

At the same time, remove the dependencies patch that is now included upstream, and remove a manual patch that seems to no longer be needed.
mkg20001 · Dec 22, 2024 · 0a53a22 · 0a53a22
1 parent 1d751ca
commit 0a53a22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 67 deletions.
diff --git a/pkgs/applications/misc/prusa-slicer/281-dependencies.patch b/pkgs/applications/misc/prusa-slicer/281-dependencies.patch
diff --git 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<ArrItem>::template set" \
-      "WritableDataStoreTraits<ArrItem>::set"
-  '';
-
   nativeBuildInputs = [
     cmake
     pkg-config