diff options
| author | adisbladis <adisbladis@gmail.com> | 2024-03-19 12:15:03 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 12:15:03 +1300 |
| commit | 142d2b81d037fbb10f12b80af23a853a6d256ad6 (patch) | |
| tree | 65e320022f35dfc9aa85a2f4cdc92143a43fe270 /pkgs/applications | |
| parent | 0346c9058a9b5eb8dd1e351b3eaf4846d5967475 (diff) | |
| parent | 7ca1c0f943fa4ceaff41a8e0cd0bbbf40e1838f7 (diff) | |
| download | nixlib-142d2b81d037fbb10f12b80af23a853a6d256ad6.tar nixlib-142d2b81d037fbb10f12b80af23a853a6d256ad6.tar.gz nixlib-142d2b81d037fbb10f12b80af23a853a6d256ad6.tar.bz2 nixlib-142d2b81d037fbb10f12b80af23a853a6d256ad6.tar.lz nixlib-142d2b81d037fbb10f12b80af23a853a6d256ad6.tar.xz nixlib-142d2b81d037fbb10f12b80af23a853a6d256ad6.tar.zst nixlib-142d2b81d037fbb10f12b80af23a853a6d256ad6.zip | |
Merge pull request #296839 from adisbladis/orca-slicer-no-inherit-patches
orca-slicer: Fix build by not inheriting patches from bambu-studio
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/bambu-studio/orca-slicer.nix | 45 |
1 files changed, 24 insertions, 21 deletions
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; + }; +}) |