From f932fa8272bea9c09d7c77b2ac12fbd3841acb83 Mon Sep 17 00:00:00 2001
From: ZachDavies <zdmalta@proton.me>
Date: Sun, 10 Aug 2025 13:51:34 +0200
Subject: [PATCH 1/4] maintainers: add ZachDavies

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9e23d7401e46..10afed3b1432 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28146,6 +28146,12 @@
     githubId = 908716;
     name = "Zach Coyle";
   };
+  ZachDavies = {
+    name = "Zach Davies";
+    email = "zdmalta@proton.me";
+    github = "ZachDavies";
+    githubId = 131615861;
+  };
   Zaczero = {
     name = "Kamil Monicz";
     email = "kamil@monicz.dev";

From c6bc3b9679561a41bf00642b92d62a06aa61c3fb Mon Sep 17 00:00:00 2001
From: ZachDavies <zdmalta@proton.me>
Date: Sun, 10 Aug 2025 13:54:23 +0200
Subject: [PATCH 2/4] LycheeSlicer: add ZachDavies as maintainer

---
 pkgs/by-name/ly/LycheeSlicer/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 07137f72633a..54e5b60e0496 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -47,7 +47,10 @@ appimageTools.wrapType2 {
     description = "All-in-one 3D slicer for resin and FDM printers";
     homepage = "https://lychee.mango3d.io/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ tarinaky ];
+    maintainers = with lib.maintainers; [ 
+      tarinaky
+      ZachDavies
+    ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "lychee";
   };

From 2b09593b79afc21eb1f9ec5a07d0390334d4fb97 Mon Sep 17 00:00:00 2001
From: ZachDavies <zdmalta@proton.me>
Date: Sun, 10 Aug 2025 13:55:44 +0200
Subject: [PATCH 3/4] LycheeSlicer: Fix mainProgram and naming

---
 pkgs/by-name/ly/LycheeSlicer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 54e5b60e0496..0893bf8d8760 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -18,7 +18,7 @@ let
     name = "Lychee Slicer";
     genericName = "Resin Slicer";
     comment = "All-in-one 3D slicer for Resin and Filament";
-    desktopName = "Lychee";
+    desktopName = "LycheeSlicer";
     noDisplay = false;
     exec = "lychee";
     terminal = false;
@@ -39,7 +39,7 @@ appimageTools.wrapType2 {
     install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*
   '';
 
-  extraLibraries = [
+  extraPkgs = _: [
     xorg.libxshmfence
   ];
 
@@ -52,6 +52,6 @@ appimageTools.wrapType2 {
       ZachDavies
     ];
     platforms = [ "x86_64-linux" ];
-    mainProgram = "lychee";
+    mainProgram = "LycheeSlicer";
   };
 }

From a28ae98486b0faba06d079bf846876bce4423077 Mon Sep 17 00:00:00 2001
From: ZachDavies <zdmalta@proton.me>
Date: Sun, 10 Aug 2025 13:56:28 +0200
Subject: [PATCH 4/4] LycheeSlicer: fixed extraPkgs and added wayland libraries

LycheeSlicer: trailing space fixed for linter
---
 pkgs/by-name/ly/LycheeSlicer/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 0893bf8d8760..1c859fd9767c 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -4,6 +4,8 @@
   makeDesktopItem,
   lib,
   xorg,
+  wayland,
+  wayland-protocols,
 }:
 let
   pname = "LycheeSlicer";
@@ -41,13 +43,15 @@ appimageTools.wrapType2 {
 
   extraPkgs = _: [
     xorg.libxshmfence
+    wayland
+    wayland-protocols
   ];
 
   meta = {
     description = "All-in-one 3D slicer for resin and FDM printers";
     homepage = "https://lychee.mango3d.io/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ 
+    maintainers = with lib.maintainers; [
       tarinaky
       ZachDavies
     ];