Unverified Commit 0536bbb6 authored by Edward Tjörnhammar's avatar Edward Tjörnhammar Committed by GitHub
Browse files

kodi: properly capture kodi.packages to allow for kodi.packages overrides (#514362)

parents 71faabb5 7d0201df

pkgs/applications/video/kodi/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -6,16 +6,15 @@ unwrapped.overrideAttrs (oldAttrs: { 
  passthru =

    let

      finalKodi = oldAttrs.passthru.kodi;

      kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; };

    in

    oldAttrs.passthru

    // {

      packages = kodiPackages;

      packages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; };

      withPackages =

        func:

        callPackage ./wrapper.nix {

          kodi = finalKodi;

          addons = kodiPackages.requiredKodiAddons (func kodiPackages);

          addons = finalKodi.packages.requiredKodiAddons (func finalKodi.packages);

        };

    };

})

pkgs/applications/video/kodi/wrapper.nix

+1 −4
Original line number Diff line number Diff line
@@ -4,12 +4,9 @@ 
  buildEnv,

  kodi,

  addons,

  callPackage,

}:



let

  kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; };



  # linux distros are supposed to provide pillow and pycryptodome

  requiredPythonPath =

    with kodi.pythonPackages;
@@ -26,7 +23,7 @@ let 
      addonsWithPythonPath = lib.filter (addon: addon ? pythonPath) addons;

    in

    lib.concatMapStringsSep ":" (

      addon: "${addon}${kodiPackages.addonDir}/${addon.namespace}/${addon.pythonPath}"

      addon: "${addon}${kodi.packages.addonDir}/${addon.namespace}/${addon.pythonPath}"

    ) addonsWithPythonPath;

in