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.

Sign up for GitHub

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: fix webkit2gtk #358948

Closed
wants to merge 1 commit into from
Closed

orca-slicer: fix webkit2gtk #358948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 15 additions & 0 deletions pkgs/by-name/or/orca-slicer/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
lib,
fetchFromGitHub,
bambu-studio,
webkitgtk_4_0,
webkitgtk_4_1,
pkg-config,
}:
bambu-studio.overrideAttrs (
finalAttrs: previousAttrs: {
Expand All @@ -15,6 +18,18 @@ bambu-studio.overrideAttrs (
hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI=";
};

nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
pkg-config
];

buildInputs = (lib.remove webkitgtk_4_0 previousAttrs.buildInputs or [ ]) ++ [
webkitgtk_4_1
];

cmakeFlags = (previousAttrs.cmakeFlags or [ ]) ++ [
"-DUSE_WEBKIT_4_1=ON"
];

patches = [
# Fix for webkitgtk linking
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
Expand Down
2 changes: 1 addition & 1 deletion ...me/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ index 9c5cb96..e92a0e3 100644

+# 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
Expand Down