From b65ca14edeb3375f2ed97b3217c5952d71b161da Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 23 Nov 2024 10:44:35 +0000 Subject: [PATCH] kodi-retroarch-advanced-launchers: move to pkgs/by-name, format with nixfmt-rfc-style --- .../package.nix} | 17 ++++++++++++----- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 12 insertions(+), 8 deletions(-) rename pkgs/{applications/emulators/retroarch/kodi-advanced-launchers.nix => by-name/ko/kodi-retroarch-advanced-launchers/package.nix} (77%) diff --git a/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/by-name/ko/kodi-retroarch-advanced-launchers/package.nix similarity index 77% rename from pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix rename to pkgs/by-name/ko/kodi-retroarch-advanced-launchers/package.nix index 9d83c46396c3..25046e03b9e7 100644 --- a/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/by-name/ko/kodi-retroarch-advanced-launchers/package.nix @@ -1,16 +1,23 @@ -{ stdenv, pkgs, lib, runtimeShell, cores ? [ ] }: +{ + stdenv, + pkgs, + lib, + runtimeShell, + cores ? [ ], +}: let - script = exec: '' #!${runtimeShell} nohup sh -c "pkill -SIGTSTP kodi" & # https://forum.kodi.tv/showthread.php?tid=185074&pid=1622750#pid1622750 nohup sh -c "sleep 10 && ${exec} '$@' -f;pkill -SIGCONT kodi" ''; - scriptSh = exec: pkgs.writeScript ("kodi-"+exec.name) (script exec.path); - execs = map (core: rec { name = core.core; path = core+"/bin/retroarch-"+name;}) cores; - + scriptSh = exec: pkgs.writeScript ("kodi-" + exec.name) (script exec.path); + execs = map (core: rec { + name = core.core; + path = core + "/bin/retroarch-" + name; + }) cores; in stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 509453bdf9a1..a9e2dacb6ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1478,9 +1478,6 @@ with pkgs; libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { }); - kodi-retroarch-advanced-launchers = - callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; - # Aliases kept here because they are easier to use x16-emulator = x16.emulator; x16-rom = x16.rom;