Avoid rec and correct indentation in pkgs/top-level/kodi-packages.nix

This commit is contained in:
Philip Taron 2024-03-08 14:34:26 -08:00
parent 93710be289
commit dbf0a30c0e
No known key found for this signature in database

View File

@ -11,24 +11,8 @@ let
inherit (libretro) fuse genesis-plus-gx mgba nestopia snes9x twenty-fortyeight;
self = rec {
addonDir = "/share/kodi/addons";
rel = "Nexus";
callPackage = newScope self;
inherit kodi;
# Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
toKodiAddon = drv: drv.overrideAttrs (oldAttrs: {
# Use passthru in order to prevent rebuilds when possible.
passthru = (oldAttrs.passthru or {}) // {
kodiAddonFor = kodi;
requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
};
});
# Check whether a derivation provides a Kodi addon.
hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;
@ -39,6 +23,22 @@ let
in
unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
self = {
addonDir = "/share/kodi/addons";
rel = "Nexus";
inherit callPackage kodi hasKodiAddon requiredKodiAddons;
# Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
toKodiAddon = drv: drv.overrideAttrs (oldAttrs: {
# Use passthru in order to prevent rebuilds when possible.
passthru = (oldAttrs.passthru or {}) // {
kodiAddonFor = kodi;
requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
};
});
# package update scripts
addonUpdateScript = callPackage ../applications/video/kodi/addons/addon-update-script { };