From 8ea5ef8eb5f788d22f0a9d32e14c51700ca31af0 Mon Sep 17 00:00:00 2001
From: "Victor B." <contact@itsvic.dev>
Date: Wed, 9 Oct 2024 00:43:50 +0200
Subject: [PATCH 1/2] maintainers: add itsvic-dev

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8b9d764cd96b..8a449012b095 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9500,6 +9500,13 @@
     email = "itepastra@gmail.com";
     keys = [ { fingerprint = "E681 4CAF 06AE B076 D55D  3E32 A16C DCBF 1472 541F"; } ];
   };
+  itsvic-dev = {
+    email = "contact@itsvic.dev";
+    name = "Victor B.";
+    github = "itsvic-dev";
+    githubId = 17727163;
+    keys = [ { fingerprint = "FBAA B86A 101B 4C5F D4F1  25D2 E93D DAC1 7E5D 6CA1"; } ];
+  };
   ius = {
     email = "j.de.gram@gmail.com";
     name = "Joerie de Gram";

From 91821f61e5de174c0791410e2d29c60350319d30 Mon Sep 17 00:00:00 2001
From: "Victor B." <contact@itsvic.dev>
Date: Wed, 30 Oct 2024 21:30:43 +0100
Subject: [PATCH 2/2] cider-2: init at 2.5.0

---
 pkgs/by-name/ci/cider-2/package.nix | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/ci/cider-2/package.nix

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
new file mode 100644
index 000000000000..8cffc3a34ef9
--- /dev/null
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -0,0 +1,47 @@
+{
+  appimageTools,
+  lib,
+  requireFile,
+  makeWrapper,
+}:
+
+appimageTools.wrapType2 rec {
+  pname = "cider-2";
+  version = "2.5.0";
+
+  src = requireFile {
+    name = "Cider-linux-appimage-x64.AppImage";
+    url = "https://cidercollective.itch.io/cider";
+    sha256 = "1nm35psq9ddii2c15kb03ifcn43fimvc4yzb4cpm1gqsiz4w21qz";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  extraInstallCommands =
+    let
+      contents = appimageTools.extract {
+        inherit version src;
+        # HACK: this looks for a ${pname}.desktop, where `cider-2.desktop` doesn't exist
+        pname = "cider";
+      };
+    in
+    ''
+      wrapProgram $out/bin/${pname} \
+         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+         --add-flags "--no-sandbox --disable-gpu-sandbox" # Cider 2 does not start up properly without these from my preliminary testing
+
+      install -m 444 -D ${contents}/cider.desktop $out/share/applications/${pname}.desktop
+      substituteInPlace $out/share/applications/${pname}.desktop \
+        --replace-warn 'Exec=AppRun --no-sandbox' 'Exec=${pname}'
+      cp -r ${contents}/usr/share/icons $out/share
+    '';
+
+  meta = {
+    description = "Powerful music player that allows you listen to your favorite tracks with style";
+    homepage = "https://cider.sh";
+    license = lib.licenses.unfree;
+    mainProgram = "cider-2";
+    maintainers = with lib.maintainers; [ itsvic-dev ];
+    platforms = [ "x86_64-linux" ];
+  };
+}