colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

super-slicer: use patched wxGTK31 instead of wxGTK32

Browse Source 
Fixes super-slicer segmentation fault on startup
This commit is contained in:
André-Patrick Bubel 2023-07-29 10:48:06 +02:00
parent b1a344f860
commit 30e93c9f3c
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -35,6 +35,7 @@
, xorg
, fetchpatch
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
, wxGTK-override ? null
}:
let
wxGTK-prusa = wxGTK32.overrideAttrs (old: rec {
@ -64,6 +65,7 @@ let
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
buildInputs = [ openexr boost tbb_2021_8 jemalloc c-blosc ilmbase ];
});
wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
in
stdenv.mkDerivation rec {
pname = "prusa-slicer";
@ -99,7 +101,7 @@ stdenv.mkDerivation rec {
pcre
qhull
tbb_2021_8
wxGTK-prusa
wxGTK-override'
xorg.libX11
] ++ lib.optionals withSystemd [
systemd

16
pkgs/applications/misc/prusa-slicer/super-slicer.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer }:
{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, wxGTK31, prusa-slicer }:
let
appname = "SuperSlicer";
pname = "super-slicer";
@ -83,6 +83,18 @@ let
passthru = allVersions;
};
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions;
wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec {
pname = "wxwidgets-prusa3d-patched";
version = "3.1.4";
src = fetchFromGitHub {
owner = "prusa3d";
repo = "wxWidgets";
rev = "489f6118256853cf5b299d595868641938566cdb";
hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ=";
fetchSubmodules = true;
};
});
prusa-slicer-wxGTK-override = prusa-slicer.override { wxGTK-override = wxGTK31-prusa; };
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer-wxGTK-override.overrideAttrs (override version))) versions;
in
allVersions.stable