Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

orca-slicer v2.2.0-unstable-2025-01-06 -> v2.2.0-unstable-2025-01-23 #375802

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions pkgs/by-name/or/orca-slicer/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cmake,
pkg-config,
wrapGAppsHook3,
boost,
boost186,
cereal,
cgal,
curl,
Expand Down Expand Up @@ -56,13 +56,13 @@ let
in
stdenv.mkDerivation rec {
pname = "orca-slicer";
version = "v2.2.0-unstable-2025-01-06";
version = "v2.2.0-unstable-2025-01-23";

src = fetchFromGitHub {
owner = "SoftFever";
repo = "OrcaSlicer";
rev = "99a0facfb3a5c9b4e661e536825c08393053cb53";
hash = "sha256-XWM04Vx65q+Vc+s3YLucS63IhGVw8ODhL2m+47nZKs8=";
rev = "1b1288c4353afca44edee323061bdd5c87fcafb9";
hash = "sha256-IPdKusP2cB5jgr6JjQVu8ZjJ2kiG6mfmfZtDVSlAFNg=";
};

nativeBuildInputs = [
Expand All @@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
buildInputs =
[
binutils
(boost.override {
(boost186.override {
enableShared = true;
enableStatic = false;
extraFeatures = [
Expand All @@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
"filesystem"
];
})
boost.dev
boost186.dev
cereal
cgal
curl
Expand Down Expand Up @@ -127,7 +127,6 @@ stdenv.mkDerivation rec {
# Fix for webkitgtk linking
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
./patches/dont-link-opencv-world-orca.patch
./patches/fix-boost.patch
];

doCheck = true;
Expand Down Expand Up @@ -163,7 +162,7 @@ stdenv.mkDerivation rec {
(lib.optionalString withSystemd "-ludev")
"-L${mesa.osmesa}/lib"
"-L${mesa.drivers}/lib"
"-L${boost}/lib"
"-L${boost186}/lib"
"-lboost_log"
"-lboost_log_setup"
];
Expand Down
60 changes: 0 additions & 60 deletions pkgs/by-name/or/orca-slicer/patches/fix-boost.patch

This file was deleted.