orca-slicer: 2.1.1 -> 2.2.0

NixOS · Oct 29, 2024 · b74b413 · b74b413
1 parent 434d3eb
commit b74b413
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 47 deletions.
diff --git a/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff
diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix
@@ -6,24 +6,22 @@
 }:
 bambu-studio.overrideAttrs (
   finalAttrs: previousAttrs: {
-    version = "2.1.1";
+    version = "2.2.0";
     pname = "orca-slicer";
 
     src = fetchFromGitHub {
       owner = "SoftFever";
       repo = "OrcaSlicer";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk=";
+      hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI=";
     };
 
-    patches =
-      previousAttrs.patches
-      ++ [
-        # FIXME: only required for 2.1.1, can be removed in the next version
-        ./0002-fix-build-for-gcc-13.diff
+    patches = [
+      # Fix for webkitgtk linking
+      ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
 
-        ./dont-link-opencv-world.patch
-      ];
+      ./dont-link-opencv-world.patch
+    ];
 
     buildInputs =
       previousAttrs.buildInputs