super-slicer: fix build broken by prusa-slicer update
super-slicer is built by overriding prusa-slicer, and the updated libraries as part of the update of prusa-slicer to v2.9.0 broke super-slicer's pinned libraries. Ideally we'd split off super-slicer as a separate package rather than continuing to make changes in prusa-slicer then undo them in super-slicer, but that seems to be a much more substantial job, so stick with the simple approach for now.
This commit is contained in:
@@ -39,6 +39,7 @@
|
||||
, webkitgtk_4_0
|
||||
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||
, wxGTK-override ? null
|
||||
, opencascade-override ? null
|
||||
}:
|
||||
let
|
||||
wxGTK-prusa = wxGTK32.overrideAttrs (old: rec {
|
||||
@@ -67,6 +68,7 @@ let
|
||||
});
|
||||
openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; };
|
||||
wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
|
||||
opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
|
||||
|
||||
patches = [
|
||||
];
|
||||
@@ -127,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mpfr
|
||||
nanosvg-fltk
|
||||
nlopt
|
||||
opencascade-occt_7_6_1
|
||||
opencascade-override'
|
||||
openvdb_tbb_2021_8
|
||||
pcre
|
||||
qhull
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
wxGTK31,
|
||||
prusa-slicer,
|
||||
libspnav,
|
||||
opencascade-occt_7_6,
|
||||
}:
|
||||
let
|
||||
appname = "SuperSlicer";
|
||||
@@ -125,9 +126,12 @@ let
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
});
|
||||
prusa-slicer-wxGTK-override = prusa-slicer.override { wxGTK-override = wxGTK31-prusa; };
|
||||
prusa-slicer-deps-override = prusa-slicer.override {
|
||||
wxGTK-override = wxGTK31-prusa;
|
||||
opencascade-override = opencascade-occt_7_6;
|
||||
};
|
||||
allVersions = builtins.mapAttrs (
|
||||
_name: version: (prusa-slicer-wxGTK-override.overrideAttrs (override version))
|
||||
_name: version: (prusa-slicer-deps-override.overrideAttrs (override version))
|
||||
) versions;
|
||||
in
|
||||
allVersions.stable
|
||||
|
||||
Reference in New Issue
Block a user