retroarch: refactor

nixos/tests/retroarch.nix

@@ -15,7 +15,7 @@ import ./make-test-python.nix (
         services.xserver.enable = true;
         services.xserver.desktopManager.retroarch = {
           enable = true;
-          package = pkgs.retroarchBare;
+          package = pkgs.retroarch-bare;
         };
         services.xserver.displayManager = {
           sddm.enable = true;

pkgs/applications/emulators/retroarch/README.md → pkgs/applications/emulators/libretro/README.md

@@ -8,31 +8,31 @@ packages.
 The basic steps to add a new core are:
 
 1. Add a new core using `mkLibretroCore` function (use one of the existing
-   files as an example)
+   cores as an example)
 2. Add your new core to [`default.nix`](./default.nix) file
 3. Try to build your core with `nix-build -A libretro.<core>`
 
 ## Using RetroArch with cores
 
 To create a custom RetroArch derivation with the cores you want (instead of
-using `retroarchFull` that includes all cores), you can use `.override` like
+using `retroarch-full` that includes all cores), you can use `.withCores` like
 this:
 
 ```nix
 { pkgs, ... }:
 
 let
-  retroarchWithCores = (pkgs.retroarch.override {
-    cores = with pkgs.libretro; [
-      bsnes
-      mgba
-      quicknes
-    ];
-  });
+  retroarchWithCores = (pkgs.retroarch.withCores (cores: with cores; [
+    bsnes
+    mgba
+    quicknes
+  ]));
 in
 {
   environment.systemPackages = [
     retroarchWithCores
   ];
 }
 ```
+
+For advanced customization, see `wrapRetroArch` wrapper.

pkgs/applications/emulators/retroarch/cores.nix → pkgs/applications/emulators/libretro/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   newScope,
-  fetchFromGitHub,
 }:
 
 lib.makeScope newScope (self: {

pkgs/applications/emulators/retroarch/mkLibretroCore.nix → pkgs/applications/emulators/libretro/mkLibretroCore.nix

@@ -3,7 +3,7 @@
   lib,
   stdenv,
   makeWrapper,
-  retroarchBare,
+  retroarch-bare,
   unstableGitUpdater,
   zlib,
   # Params
@@ -28,7 +28,7 @@ let
     "lib"
     "stdenv"
     "makeWrapper"
-    "retroarchBare"
+    "retroarch-bare"
     "unstableGitUpdater"
     "zlib"
 
@@ -73,7 +73,7 @@ stdenv.mkDerivation (
       runHook preInstall
 
       install -Dt ${coreDir} ${coreFilename}
-      makeWrapper ${retroarchBare}/bin/retroarch $out/bin/${mainProgram} \
+      makeWrapper ${retroarch-bare}/bin/retroarch $out/bin/${mainProgram} \
         --add-flags "-L ${coreDir}/${coreFilename}"
 
       runHook postInstall
@@ -90,7 +90,7 @@ stdenv.mkDerivation (
       with lib;
       {
         inherit mainProgram;
-        inherit (retroarchBare.meta) platforms;
+        inherit (retroarch-bare.meta) platforms;
         homepage = "https://www.libretro.com/";
         maintainers = with maintainers; teams.libretro.members;
       }

pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix → 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 {

pkgs/applications/emulators/retroarch/libretro-core-info.nix → pkgs/by-name/li/libretro-core-info/package.nix

@@ -1,7 +1,8 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gitUpdater
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gitUpdater,
 }:
 
 stdenvNoCC.mkDerivation rec {

pkgs/applications/emulators/retroarch/retroarch-assets.nix → pkgs/by-name/re/retroarch-assets/package.nix

@@ -1,7 +1,8 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, unstableGitUpdater
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  unstableGitUpdater,
 }:
 
 stdenvNoCC.mkDerivation {