diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index b600f6164010..dc55a4d02f69 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,24 +1,27 @@ { lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: -let - orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "1.9.1"; - pname = "orca-slicer"; - src = fetchFromGitHub { - owner = "SoftFever"; - repo = "OrcaSlicer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; - }; +bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { + version = "1.9.1"; + pname = "orca-slicer"; - meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; - homepage = "https://github.com/SoftFever/OrcaSlicer"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; - mainProgram = "orca-slicer"; - platforms = platforms.linux; - }; - }); -in -orca-slicer + # Don't inherit patches from bambu-studio + patches = [ + ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + ]; + + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; + }; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; +})