b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #194021 from danderson/danderson/superslicer

Browse source 
super-slicer: use non-EGL version of wxWidgets.
This commit is contained in:
Cabia Rangris 2022-10-12 15:22:59 +04:00 committed by GitHub
parent d2afb051ff d709a706c9
commit 216e5aa763
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/wxwidgets/wxGTK31.nix
View file

@ -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 [

14
pkgs/top-level/all-packages.nix
View file

@ -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 { };