retroArchCores: remove
`retroArchCores` is strange: it requires a global configuration on nixpkgs, as:
```nix
nixpkgs.config.retroarch = {
enableDolphin = true;
enableMGBA = true;
enableMAME = true;
};
```
To do so, we ended up declaring all available emulators on
`all-packages.nix`. Failing to do so would mean that the emulator
wouldn't be available.
However, there is a mechanism on nixpkgs that also works: overrides.
Overrides are similar on how other packages works, for example:
```nix
(retroarch.override { cores = with libretro; [ citra snes9x ]; });
```
So let's remove `retroArchCores` and leave the overrides mechanism
instead.
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
{ stdenv, pkgs, lib, cores, runtimeShell }:
|
||||
|
||||
assert cores != [];
|
||||
{ stdenv, pkgs, lib, runtimeShell, cores ? [ ] }:
|
||||
|
||||
let
|
||||
|
||||
|
||||
@@ -787,9 +787,10 @@ mapAliases ({
|
||||
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15
|
||||
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
|
||||
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
|
||||
ring-daemon = jami-daemon; #added 2021-10-26
|
||||
ring-daemon = jami-daemon; # added 2021-10-26
|
||||
radare2-cutter = cutter; # added 2021-03-30
|
||||
redkite = throw "redkite was archived by upstream"; # added 2021-04-12
|
||||
retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19
|
||||
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
|
||||
rpiboot-unstable = rpiboot; # added 2021-07-30
|
||||
rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08
|
||||
@@ -992,6 +993,7 @@ mapAliases ({
|
||||
wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18
|
||||
wireguard = wireguard-tools; # added 2018-05-19
|
||||
morituri = whipper; # added 2018-09-13
|
||||
xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19
|
||||
xp-pen-g430 = pentablet-driver; # added 2020-05-03
|
||||
xdg_utils = xdg-utils; # added 2021-02-01
|
||||
xfceUnstable = xfce4-14; # added 2019-09-17
|
||||
|
||||
@@ -29126,94 +29126,6 @@ with pkgs;
|
||||
|
||||
wp-cli = callPackage ../development/tools/wp-cli { };
|
||||
|
||||
retroArchCores =
|
||||
let
|
||||
cfg = config.retroarch or {};
|
||||
inherit (lib) optional;
|
||||
in with libretro;
|
||||
([ ]
|
||||
++ optional (cfg.enableAtari800 or false) atari800
|
||||
++ optional (cfg.enableBeetleGBA or false) beetle-gba
|
||||
++ optional (cfg.enableBeetleLynx or false) beetle-lynx
|
||||
++ optional (cfg.enableBeetleNGP or false) beetle-ngp
|
||||
++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast
|
||||
++ optional (cfg.enableBeetlePCFX or false) beetle-pcfx
|
||||
++ optional (cfg.enableBeetlePSX or false) beetle-psx
|
||||
++ optional (cfg.enableBeetlePSXHW or false) beetle-psx-hw
|
||||
++ optional (cfg.enableBeetleSaturn or false) beetle-saturn
|
||||
++ optional (cfg.enableBeetleSaturnHW or false) beetle-saturn-hw
|
||||
++ optional (cfg.enableBeetleSNES or false) beetle-snes
|
||||
++ optional (cfg.enableBeetleSuperGrafx or false) beetle-supergrafx
|
||||
++ optional (cfg.enableBeetleWswan or false) beetle-wswan
|
||||
++ optional (cfg.enableBeetleVB or false) beetle-vb
|
||||
++ optional (cfg.enableBlueMSX or false) bluemsx
|
||||
++ optional (cfg.enableBsnesMercury or false) bsnes-mercury
|
||||
++ optional (cfg.enableCitra or false) citra
|
||||
++ optional (cfg.enableDesmume or false) desmume
|
||||
++ optional (cfg.enableDesmume2015 or false) desmume2015
|
||||
++ optional (cfg.enableDolphin or false) dolphin
|
||||
++ optional (cfg.enableDOSBox or false) dosbox
|
||||
++ optional (cfg.enableEightyOne or false) eightyone
|
||||
++ optional (cfg.enableFBAlpha2012 or false) fbalpha2012
|
||||
++ optional (cfg.enableFBNeo or false) fbneo
|
||||
++ optional (cfg.enableFceumm or false) fceumm
|
||||
++ optional (cfg.enableFlycast or false) flycast
|
||||
++ optional (cfg.enableFMSX or false) fmsx
|
||||
++ optional (cfg.enableFreeIntv or false) freeintv
|
||||
++ optional (cfg.enableGambatte or false) gambatte
|
||||
++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
|
||||
++ optional (cfg.enableGpsp or false) gpsp
|
||||
++ optional (cfg.enableGW or false) gw
|
||||
++ optional (cfg.enableHandy or false) handy
|
||||
++ optional (cfg.enableHatari or false) hatari
|
||||
++ optional (cfg.enableMAME or false) mame
|
||||
++ optional (cfg.enableMAME2000 or false) mame2000
|
||||
++ optional (cfg.enableMAME2003 or false) mame2003
|
||||
++ optional (cfg.enableMAME2003Plus or false) mame2003-plus
|
||||
++ optional (cfg.enableMAME2010 or false) mame2010
|
||||
++ optional (cfg.enableMAME2015 or false) mame2015
|
||||
++ optional (cfg.enableMAME2016 or false) mame2016
|
||||
++ optional (cfg.enableMesen or false) mesen
|
||||
++ optional (cfg.enableMeteor or false) meteor
|
||||
++ optional (cfg.enableMGBA or false) mgba
|
||||
++ optional (cfg.enableMupen64Plus or false) mupen64plus
|
||||
++ optional (cfg.enableNeoCD or false) neocd
|
||||
++ optional (cfg.enableNestopia or false) nestopia
|
||||
++ optional (cfg.enableNP2kai or false) np2kai
|
||||
++ optional (cfg.enableO2EM or false) o2em
|
||||
++ optional (cfg.enableOpera or false) opera
|
||||
++ optional (cfg.enableParallelN64 or false) parallel-n64
|
||||
++ optional (cfg.enablePCSXRearmed or false) pcsx_rearmed
|
||||
++ optional (cfg.enablePicodrive or false) picodrive
|
||||
++ optional (cfg.enablePlay or false) play
|
||||
++ optional (cfg.enablePPSSPP or false) ppsspp
|
||||
++ optional (cfg.enablePrboom or false) prboom
|
||||
++ optional (cfg.enableProSystem or false) prosystem
|
||||
++ optional (cfg.enableQuickNES or false) quicknes
|
||||
++ optional (cfg.enableSameBoy or false) sameboy
|
||||
++ optional (cfg.enableScummVM or false) scummvm
|
||||
++ optional (cfg.enableSMSPlusGX or false) smsplus-gx
|
||||
++ optional (cfg.enableSnes9x or false) snes9x
|
||||
++ optional (cfg.enableSnes9x2002 or false) snes9x2002
|
||||
++ optional (cfg.enableSnes9x2005 or false) snes9x2005
|
||||
++ optional (cfg.enableSnes9x2010 or false) snes9x2010
|
||||
++ optional (cfg.enableStella or false) stella
|
||||
++ optional (cfg.enableStella2014 or false) stella2014
|
||||
++ optional (cfg.enableTGBDual or false) tgbdual
|
||||
++ optional (cfg.enableThePowderToy or false) the-powder-toy
|
||||
++ optional (cfg.enableTIC80 or false) tic80
|
||||
++ optional (cfg.enableVbaNext or false) vba-next
|
||||
++ optional (cfg.enableVbaM or false) vba-m
|
||||
++ optional (cfg.enableVecx or false) vecx
|
||||
++ optional (cfg.enableVirtualJaguar or false) virtualjaguar
|
||||
++ optional (cfg.enableYabause or false) yabause
|
||||
);
|
||||
|
||||
wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix {
|
||||
inherit retroarch;
|
||||
cores = retroArchCores;
|
||||
};
|
||||
|
||||
wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
|
||||
|
||||
wxhexeditor = callPackage ../applications/editors/wxhexeditor {
|
||||
@@ -29293,10 +29205,7 @@ with pkgs;
|
||||
kodi-cli = callPackage ../tools/misc/kodi-cli { };
|
||||
|
||||
kodi-retroarch-advanced-launchers =
|
||||
callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
|
||||
cores = retroArchCores;
|
||||
};
|
||||
xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers;
|
||||
callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { };
|
||||
|
||||
xca = libsForQt5.callPackage ../applications/misc/xca { };
|
||||
|
||||
@@ -32869,6 +32778,10 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
|
||||
};
|
||||
|
||||
wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix {
|
||||
inherit retroarch;
|
||||
};
|
||||
|
||||
retroarch = wrapRetroArch { retroarch = retroarchBare; };
|
||||
|
||||
libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix {
|
||||
|
||||
Reference in New Issue
Block a user