From cbead292e4aafd2ff4a384cfead3fb824d3d0657 Mon Sep 17 00:00:00 2001 From: diniamo Date: Mon, 2 Sep 2024 17:04:28 +0200 Subject: [PATCH] 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 '';