nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 07:37:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #178628 from gador/fix-prusa-slicer

Browse Source 
prusa-slicer: fix boost 1.79 incompatibility
This commit is contained in:
Bernardo Meurer 2022-06-23 12:18:40 -04:00 committed by GitHub
commit 70b75dd824
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,39 @@
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem
, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat
, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt
, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
, wxGTK31-gtk3-override ? null }:
{ stdenv
, lib
, binutils
, fetchFromGitHub
, cmake
, copyDesktopItems
, makeDesktopItem
, pkg-config
, wrapGAppsHook
, boost
, cereal
, cgal_5
, curl
, dbus
, eigen
, expat
, glew
, glib
, gmp
, gtest
, gtk3
, hicolor-icon-theme
, ilmbase
, libpng
, mpfr
, nlopt
, openvdb
, pcre
, qhull
, systemd
, tbb
, wxGTK31-gtk3
, xorg
, fetchpatch
, wxGTK31-gtk3-override ? null
}:
let
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
pname = "wxwidgets-prusa3d-patched";
@ -16,7 +47,8 @@ let
};
});
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.4.2";
@ -28,6 +60,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
binutils
boost
cereal
cgal_5
@ -58,6 +91,16 @@ in stdenv.mkDerivation rec {
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
})
# Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238
# Can be removed with the next version update
(fetchpatch {
url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch";
sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8=";
})
(fetchpatch {
url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch";
sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20=";
})
];
doCheck = true;