From 1b48f9f10556a2acf3f6a219244dc52f5b1aad2c Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Mon, 4 Aug 2025 12:37:42 +0800 Subject: [PATCH] orca-slicer: remove dependency on libsoup2 --- pkgs/by-name/or/orca-slicer/package.nix | 4 ++-- ...-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 7e817859988a..8f5f53fa3c9e 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -35,7 +35,7 @@ pcre, systemd, tbb_2021, - webkitgtk_4_0, + webkitgtk_4_1, wxGTK31, xorg, libnoise, @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { openvdb pcre tbb_2021 - webkitgtk_4_0 + webkitgtk_4_1 wxGTK' xorg.libX11 opencv.cxxdev diff --git a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch index 15f1bf8f0b59..8cf334513144 100644 --- a/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch +++ b/pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch @@ -20,15 +20,14 @@ index 9c5cb96..e92a0e3 100644 @@ -175,6 +175,11 @@ if (WIN32) target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly) endif () - + +# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.0") ++ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.1") +endif () + # Link the resources dir to where Slic3r GUI expects it set(output_dlls_Release "") set(output_dlls_Debug "") --- +-- 2.38.1 -