mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 21:40:12 +00:00
7d0201dfa6
Previously kodi.withPackages constructed its own kodiPackages set instead of using the one exposed through kodi.passthru.packages, preventing the use of overridden kodi packages in kodi.withPackages. This change package overrides such that they are observed by both addon selection and wrapper path construction.
21 lines
545 B
Nix
21 lines
545 B
Nix
{ callPackage, ... }@args:
|
|
let
|
|
unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]);
|
|
in
|
|
unwrapped.overrideAttrs (oldAttrs: {
|
|
passthru =
|
|
let
|
|
finalKodi = oldAttrs.passthru.kodi;
|
|
in
|
|
oldAttrs.passthru
|
|
// {
|
|
packages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; };
|
|
withPackages =
|
|
func:
|
|
callPackage ./wrapper.nix {
|
|
kodi = finalKodi;
|
|
addons = finalKodi.packages.requiredKodiAddons (func finalKodi.packages);
|
|
};
|
|
};
|
|
})
|