From d709a706c90559f60448289286c454778f7db5f4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 1 Oct 2022 19:27:53 -0700 Subject: [PATCH] super-slicer: use non-EGL version of wxWidgets. Fixes #193135 Signed-off-by: David Anderson --- pkgs/development/libraries/wxwidgets/wxGTK31.nix | 2 ++ pkgs/top-level/all-packages.nix | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 5bce6250c74f..d84c8a5aa5e4 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -17,6 +17,7 @@ , compat28 ? false , compat30 ? true , unicode ? true +, withEGL ? true , withGtk2 ? (!stdenv.isDarwin) , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withWebKit ? stdenv.isDarwin @@ -95,6 +96,7 @@ stdenv.mkDerivation rec { (if compat28 then "--enable-compat28" else "--disable-compat28") (if compat30 then "--enable-compat30" else "--disable-compat30") ] + ++ lib.optional (!withEGL) "--disable-glcanvasegl" ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fff8023f2a27..4815db7278a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31369,9 +31369,19 @@ with pkgs; prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; - super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { + wxGTK31-gtk3 = wxGTK31-gtk3.override { + # https://github.com/supermerill/SuperSlicer/issues/1093 + withEGL = false; + }; + }; - super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest; + super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { + wxGTK31-gtk3 = wxGTK31-gtk3.override { + # https://github.com/supermerill/SuperSlicer/issues/1093 + withEGL = false; + }; + }).latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };