dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #296839 from adisbladis/orca-slicer-no-inherit-patches

Browse Source 
orca-slicer: Fix build by not inheriting patches from bambu-studio
This commit is contained in:
adisbladis 2024-03-19 12:15:03 +13:00 committed by GitHub
commit 142d2b81d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/applications/misc/bambu-studio/orca-slicer.nix
View File

@ -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;
};
})