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

super-slicer, super-slicer-latest: add darwin support

Browse Source
This commit is contained in:
Weijia Wang
2022-11-27 01:36:33 +01:00
parent c1e7858141
commit ea6aa98328
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/prusa-slicer/super-slicer.nix
+15 -4
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31 }:
{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer }:
let
appname = "SuperSlicer";
pname = "super-slicer";
@@ -22,7 +22,13 @@ let
# Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823
(fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch";
sha256 = "sha256-xMbUjumPZ/7ulyRuBA76CwIv4BOpd+yKXCINSf58FxI=";
# Excludes Linux-only patches
excludes = [
"src/slic3r/GUI/FreeCADDialog.cpp"
"src/slic3r/GUI/Tab.cpp"
"src/slic3r/Utils/Http.cpp"
];
sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c=";
})
];
};
@@ -39,6 +45,12 @@ let
fetchSubmodules = true;
};
# wxScintilla is not used on macOS
prePatch = super.prePatch + ''
substituteInPlace src/CMakeLists.txt \
--replace "scintilla" ""
'';
# We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.
postInstall = null;
separateDebugInfo = true;
@@ -71,7 +83,6 @@ let
passthru = allVersions;
};
prusa-slicer' = prusa-slicer.override { wxGTK31-override = wxGTK31; };
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions;
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions;
in
allVersions.stable
pkgs/top-level/all-packages.nix
+2 -12
View File
@@ -32053,19 +32053,9 @@ with pkgs;
prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { };
super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix {
wxGTK31 = wxGTK31.override {
# https://github.com/supermerill/SuperSlicer/issues/1093
withEGL = false;
};
};
super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };
super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix {
wxGTK31 = wxGTK31.override {
# https://github.com/supermerill/SuperSlicer/issues/1093
withEGL = false;
};
}).latest;
super-slicer-latest = super-slicer.latest;
snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };