Syntax fix for xbmc/retroarch in all-packages.nix

This commit is contained in:
Rickard Nilsson 2014-10-02 20:09:18 +02:00 committed by Edward Tjörnhammar
parent 37a83771e6
commit f615942664

View File

@ -10520,48 +10520,41 @@ let
}; };
retroArchCores = retroArchCores =
let let
cfg = stdenv.lib.attrByPath [ "retroarch" ] {} config; cfg = config.retroarch or {};
in inherit (lib) optional;
with libretro; in with libretro;
([ ] ([ ]
++ lib.optional (cfg.enable4do or false) _4do ++ optional (cfg.enable4do or false) _4do
++ lib.optional (cfg.enableBsnesMercury or false) bsnes-mercury ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury
++ lib.optional (cfg.enableDesmume or false) desmume ++ optional (cfg.enableDesmume or false) desmume
++ lib.optional (cfg.enableFBA or false) fba ++ optional (cfg.enableFBA or false) fba
++ lib.optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableFceumm or false) fceumm
++ lib.optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGambatte or false) gambatte
++ lib.optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
++ lib.optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableMupen64Plus or false) mupen64plus
++ lib.optional (cfg.enablePicodrive or false) picodrive ++ optional (cfg.enablePicodrive or false) picodrive
++ lib.optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enablePrboom or false) prboom
++ lib.optional (cfg.enablePPSSPP or false) ppsspp ++ optional (cfg.enablePPSSPP or false) ppsspp
++ lib.optional (cfg.enableScummVM or false) scummvm ++ optional (cfg.enableScummVM or false) scummvm
++ lib.optional (cfg.enableSnes9xNext or false) snes9x-next ++ optional (cfg.enableSnes9xNext or false) snes9x-next
++ lib.optional (cfg.enableStella or false) stella ++ optional (cfg.enableStella or false) stella
++ lib.optional (cfg.enableVbaNext or false) vba-next ++ optional (cfg.enableVbaNext or false) vba-next
); );
wrapRetroArch = { retroarch }: wrapRetroArch = { retroarch }: import ../misc/emulators/retroarch/wrapper.nix {
let inherit stdenv lib makeWrapper retroarch;
cfg = stdenv.lib.attrByPath [ "retroarch" ] {} config; cores = retroArchCores;
in };
import ../misc/emulators/retroarch/wrapper.nix {
inherit stdenv lib makeWrapper retroarch;
cores = retroArchCores;
};
wrapXBMC = { xbmc }: wrapXBMC = { xbmc }: import ../applications/video/xbmc/wrapper.nix {
let inherit stdenv lib makeWrapper xbmc;
cfg = stdenv.lib.attrByPath [ "xbmc" ] {} config; plugins = let inherit (lib) optional; in with xbmcPlugins;
in ([]
import ../applications/video/xbmc/wrapper.nix { ++ optional (config.xbmc.enableAdvancedLauncher or false) advanced-launcher
inherit stdenv lib makeWrapper xbmc; ++ optional (config.xbmc.enableSVTPlay or false) svtplay
plugins = with xbmcPlugins; );
([] };
++ lib.optional (cfg.enableAdvancedLauncher or false) advanced-launcher
);
};
wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; wxhexeditor = callPackage ../applications/editors/wxhexeditor { };