diff options
Diffstat (limited to 'pkgs/applications/misc/prusa-slicer/default.nix')
-rw-r--r-- | pkgs/applications/misc/prusa-slicer/default.nix | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 0c9907764f22..8114f2ecb416 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -32,6 +32,9 @@ , tbb_2021_8 , wxGTK32 , xorg +, libbgcode +, heatshrink +, catch2 , fetchpatch , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , wxGTK-override ? null @@ -68,7 +71,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.6.1"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "PrusaSlicer"; + hash = "sha256-S0z2v6knkQ+xlABB1zedEGtlxA/65X/vxLh304StfbE="; + rev = "version_${finalAttrs.version}"; + }; nativeBuildInputs = [ cmake @@ -102,6 +112,9 @@ stdenv.mkDerivation (finalAttrs: { tbb_2021_8 wxGTK-override' xorg.libX11 + libbgcode + heatshrink + catch2 ] ++ lib.optionals withSystemd [ systemd ]; @@ -143,21 +156,6 @@ stdenv.mkDerivation (finalAttrs: { --replace "#ifdef __APPLE__" "#if 0" ''; - patches = [ - # wxWidgets: CheckResizerFlags assert fix - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c.patch"; - hash = "sha256-MNGtaI7THu6HEl9dMwcO1hkrCtIkscoNh4ulA2cKtZA="; - }) - ]; - - src = fetchFromGitHub { - owner = "prusa3d"; - repo = "PrusaSlicer"; - hash = "sha256-t5lnBL7SZVfyR680ZK29YXgE3pag+uVv4+BGJZq40/A="; - rev = "version_${finalAttrs.version}"; - }; - cmakeFlags = [ "-DSLIC3R_STATIC=0" "-DSLIC3R_FHS=1" |