Unverified Commit 216e5aa7 authored by Cabia Rangris's avatar Cabia Rangris Committed by GitHub
Browse files

Merge pull request #194021 from danderson/danderson/superslicer 

super-slicer: use non-EGL version of wxWidgets.
parents d2afb051 d709a706

pkgs/development/libraries/wxwidgets/wxGTK31.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 [

pkgs/top-level/all-packages.nix

+12 −2
Original line number Diff line number Diff line
@@ -31558,9 +31558,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 { };