retroarch: add withCores helper

NixOS · Nov 23, 2024 · d53fcbe · d53fcbe
1 parent 2bf2bb9
commit d53fcbe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -37,6 +37,7 @@
   wayland-scanner,
   zlib,
   # wrapper deps
+  libretro,
   libretro-core-info,
   retroarch-assets,
   retroarch-bare,
@@ -153,6 +154,7 @@ stdenv.mkDerivation rec {
       import ./wrapper.nix {
         inherit
           lib
+          libretro
           makeWrapper
           retroarch-bare
           runCommand

diff --git a/pkgs/by-name/re/retroarch-bare/wrapper.nix b/pkgs/by-name/re/retroarch-bare/wrapper.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  libretro,
   makeWrapper,
   retroarch-bare,
   runCommand,
@@ -45,6 +46,7 @@ symlinkJoin {
   passthru = {
     inherit cores;
     unwrapped = retroarch-bare;
+    withCores = coreFun: retroarch-bare.wrapper { cores = (coreFun libretro); };
   };
 
   postBuild = ''

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1454,18 +1454,18 @@ with pkgs;
 
   ### APPLICATIONS/EMULATORS/RETROARCH
 
-  retroarch-full = wrapRetroArch {
-    cores = builtins.filter
-      # Remove cores not supported on platform
-      (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c))
-      (builtins.attrValues libretro);
-  };
+  libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { });
 
-  wrapRetroArch = retroarch-bare.wrapper;
+  retroarch = retroarch-bare.wrapper { };
 
-  retroarch = retroarch-bare.wrapper;
+  retroarch-full = retroarch.withCores (
+    cores:
+      builtins.filter
+        (c: (c ? libretroCore) && (lib.meta.availableOn stdenv.hostPlatform c))
+        (builtins.attrValues cores)
+  );
 
-  libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { });
+  wrapRetroArch = retroarch-bare.wrapper;
 
   # Aliases kept here because they are easier to use
   x16-emulator = x16.emulator;