From fc6f9d18db32db316997feb2ccaa61beda64559f Mon Sep 17 00:00:00 2001 From: Charlie B Date: Tue, 26 Nov 2024 16:38:16 +0000 Subject: [PATCH] prusa-slicer: Move boost log link from patch to args --- .../misc/prusa-slicer/281-dependencies.patch | 10 ---------- pkgs/applications/misc/prusa-slicer/default.nix | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/281-dependencies.patch b/pkgs/applications/misc/prusa-slicer/281-dependencies.patch index fd5776b998eea..7ba338deb16c9 100644 --- a/pkgs/applications/misc/prusa-slicer/281-dependencies.patch +++ b/pkgs/applications/misc/prusa-slicer/281-dependencies.patch @@ -58,13 +58,3 @@ index 78369233d..1f9c40aaf 100644 ) if (MSVC) -diff --git a/tests/sla_print/CMakeLists.txt b/tests/sla_print/CMakeLists.txt -index b244e76ac..b23f6d4bc 100644 ---- a/tests/sla_print/CMakeLists.txt -+++ b/tests/sla_print/CMakeLists.txt -@@ -18,3 +18,5 @@ endif() - - # catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ") - add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests ${CATCH_EXTRA_ARGS}) -+ -+add_definitions(-DBOOST_LOG_DYN_LINK) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 8dc78251ba6ef..514d720256ad9 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { "-DSLIC3R_STATIC=0" "-DSLIC3R_FHS=1" "-DSLIC3R_GTK=3" + "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK" ]; postInstall = ''