From cbead292e4aafd2ff4a384cfead3fb824d3d0657 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Mon, 2 Sep 2024 17:04:28 +0200
Subject: [PATCH 1/4] ani-cli: only add the player to the PATH as a fallback,
 format

---
 pkgs/by-name/an/ani-cli/package.nix | 62 ++++++++++++++++-------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index b5d9fb11f5e0..21a4f6352c0e 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -1,23 +1,29 @@
-{ fetchFromGitHub
-, makeWrapper
-, stdenvNoCC
-, lib
-, gnugrep
-, gnused
-, curl
-, catt
-, syncplay
-, ffmpeg
-, fzf
-, aria2
-, withMpv ? true, mpv
-, withVlc ? false, vlc
-, withIina ? false, iina
-, chromecastSupport ? false
-, syncSupport ? false
+{
+  fetchFromGitHub,
+  makeWrapper,
+  stdenvNoCC,
+  lib,
+  gnugrep,
+  gnused,
+  curl,
+  catt,
+  syncplay,
+  ffmpeg,
+  fzf,
+  aria2,
+  mpv,
+  vlc,
+  iina,
+  withMpv ? true,
+  withVlc ? false,
+  withIina ? false,
+  chromecastSupport ? false,
+  syncSupport ? false,
 }:
 
-assert withMpv || withVlc || withIina;
+let
+  players = lib.optional withMpv mpv ++ lib.optional withVlc vlc ++ lib.optional withIina iina;
+in
 
 stdenvNoCC.mkDerivation rec {
   pname = "ani-cli";
@@ -31,15 +37,14 @@ stdenvNoCC.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  runtimeDependencies =
-    let player = []
-        ++ lib.optional withMpv mpv
-        ++ lib.optional withVlc vlc
-        ++ lib.optional withIina iina;
-    in [ gnugrep gnused curl fzf ffmpeg aria2 ]
-      ++ player
-      ++ lib.optional chromecastSupport catt
-      ++ lib.optional syncSupport syncplay;
+  runtimeDependencies = [
+    gnugrep
+    gnused
+    curl
+    fzf
+    ffmpeg
+    aria2
+  ] ++ lib.optional chromecastSupport catt ++ lib.optional syncSupport syncplay;
 
   installPhase = ''
     runHook preInstall
@@ -47,7 +52,8 @@ stdenvNoCC.mkDerivation rec {
     install -Dm755 ani-cli $out/bin/ani-cli
 
     wrapProgram $out/bin/ani-cli \
-      --prefix PATH : ${lib.makeBinPath runtimeDependencies}
+      --prefix PATH : ${lib.makeBinPath runtimeDependencies} \
+      ${lib.optionalString (builtins.length players > 0) "--suffix PATH : ${lib.makeBinPath players}"}
 
     runHook postInstall
   '';

From c3d2d3e3148d9fb50554799c379ece36238f7ba3 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 14 Sep 2024 21:13:17 +0200
Subject: [PATCH 2/4] ani-cli: add diniamo as a maintainer

---
 pkgs/by-name/an/ani-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index 21a4f6352c0e..158cef30a400 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/pystardust/ani-cli";
     description = "Cli tool to browse and play anime";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ skykanin ];
+    maintainers = with maintainers; [ skykanin diniamo ];
     platforms = platforms.unix;
     mainProgram = "ani-cli";
   };

From 80ab465c94ee609d5629bb97a4043465f0d5661f Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 14 Sep 2024 21:26:07 +0200
Subject: [PATCH 3/4] ani-cli: avoid `with lib;`

---
 pkgs/by-name/an/ani-cli/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index 158cef30a400..a3d5fa98b2b5 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -58,12 +58,15 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/pystardust/ani-cli";
     description = "Cli tool to browse and play anime";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ skykanin diniamo ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      skykanin
+      diniamo
+    ];
+    platforms = lib.platforms.unix;
     mainProgram = "ani-cli";
   };
 }

From 0ac27f49bfd68f9fdcbb46d271b691bc7458543d Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 14 Sep 2024 21:26:22 +0200
Subject: [PATCH 4/4] ani-cli: avoid `rec`

---
 pkgs/by-name/an/ani-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index a3d5fa98b2b5..da34a48d55e0 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -25,19 +25,19 @@ let
   players = lib.optional withMpv mpv ++ lib.optional withVlc vlc ++ lib.optional withIina iina;
 in
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ani-cli";
   version = "4.9";
 
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ani-cli";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  runtimeDependencies = [
+  runtimeInputs = [
     gnugrep
     gnused
     curl
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec {
     install -Dm755 ani-cli $out/bin/ani-cli
 
     wrapProgram $out/bin/ani-cli \
-      --prefix PATH : ${lib.makeBinPath runtimeDependencies} \
+      --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs} \
       ${lib.optionalString (builtins.length players > 0) "--suffix PATH : ${lib.makeBinPath players}"}
 
     runHook postInstall
@@ -69,4 +69,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.unix;
     mainProgram = "ani-cli";
   };
-}
+})