diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 20e6d3947fa8..85d0c618d72e 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -13,7 +13,7 @@ curl, dbus, draco, - eigen, + eigen_5, expat, ffmpeg, gcc-unwrapped, @@ -36,7 +36,7 @@ systemd, onetbb, webkitgtk_4_1, - wxwidgets_3_1, + wxwidgets_3_3, libx11, libnoise, withSystemd ? stdenv.hostPlatform.isLinux, @@ -44,8 +44,7 @@ }: let wxGTK' = - (wxwidgets_3_1.override { - withCurl = true; + (wxwidgets_3_3.override { withPrivateFonts = true; withWebKit = true; withEGL = false; @@ -61,13 +60,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "orca-slicer"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "OrcaSlicer"; repo = "OrcaSlicer"; tag = "v${finalAttrs.version}"; - hash = "sha256-c1WTODLrXGtyJWkEueOz5jHhPbA/JFcMeAwhpvoKnKo="; + hash = "sha256-ogo+Xuz7yBz9POVKfLofnxwIQavkApPzTIdp/Phu/UU="; }; nativeBuildInputs = [ @@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus draco - eigen + eigen_5 expat ffmpeg gcc-unwrapped @@ -132,11 +131,11 @@ stdenv.mkDerivation (finalAttrs: { ./patches/dont-link-opencv-world-orca.patch # The changeset from https://github.com/OrcaSlicer/OrcaSlicer/pull/7650, can be removed when that PR gets merged # Allows disabling the update nag screen - (fetchpatch { - name = "pr-7650-configurable-update-check.patch"; - url = "https://github.com/OrcaSlicer/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch"; - hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk="; - }) + #(fetchpatch { + # name = "pr-7650-configurable-update-check.patch"; + # url = "https://github.com/OrcaSlicer/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch"; + # hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk="; + #}) # Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency ./patches/no-ilmbase.patch diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index be8899dea103..078dc6706c1d 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -27,6 +27,8 @@ compat32 ? true, withMesa ? !stdenv.hostPlatform.isDarwin, withWebKit ? true, + withEGL ? true, + withPrivateFonts ? false, webkitgtk_4_1, }: @@ -85,6 +87,8 @@ stdenv.mkDerivation (finalAttrs: { (if compat32 then "--enable-compat32" else "--disable-compat32") ] ++ lib.optional withMesa "--with-opengl" + ++ lib.optional (!withEGL) "--disable-glcanvasegl" + ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}" "--with-osx_cocoa" @@ -115,7 +119,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru = { - inherit compat30 compat32; + inherit + compat30 + compat32 + withEGL + withPrivateFonts + ; }; meta = {