Make kodi overrideAttrs and withPackages composable

[dwagenk]

Description of changes

When using a kodi derivation modified with overrideAttrs and adding extensions to it with withPackages the changes were discarded and the original unmodified kodi derivation was wrapped together with the extensions.
Fix this by switching kodi to use the mkDerivation with finalAttrs pattern (described in #119942 and https://nixos.org/manual/nixpkgs/stable/#mkderivation-recursive-attributes).

Things done

For testing I've assebled a little flake

Test-Flake (expand)

{
  description = "test flake for nixpkgs kodi override";

  inputs = {
    nixpkgs.url = github:nixos/nixpkgs/release-22.11;
    flake-utils.url = "github:numtide/flake-utils";
    nix-flake-tests.url = "github:antifuchs/nix-flake-tests";
  };

  outputs = inputs@{ self, nixpkgs, flake-utils, nix-flake-tests }:
    flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
      let
        pkgs = import nixpkgs
          {
            localSystem = "${system}";
            overlays = [
              (final: prev: {
                kodi = prev.kodi.overrideAttrs (o: {
                  pname = "test-kodi";
                });
              })
            ];
          };
      in
      {
        packages = {
          inherit (pkgs) kodi;
          kodi-with-addons = pkgs.kodi.withPackages (p: [ p.inputstreamhelper ]);
        };
        checks = {
          kodi = nix-flake-tests.lib.check {
            inherit pkgs;
            tests = {
              testNameStartsWithPName = rec {
                expected = "test-kodi-";
                expr = builtins.substring 0 (builtins.stringLength expected)
                  self.packages.${system}.kodi-with-addons.name;
              };
              testAddonGetsLinked = {
                expected = [ ]; # exact match of regex returns empty list
                expr = builtins.match ".*-kodi-inputstreamhelper-.*"
                  self.packages.${system}.kodi-with-addons.postBuild;
              };
            };
          };
        };
      }
    );
}

The resulting kodi-with-addons derivation includes both, the pname changed via overrideAttrs as well as the postBuild wrapping for the inputstream plugin added via withPackages.

Running it is possible, finds the plugin and doesn't have any signs of anything being wrong.

• Built on #platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 23.05 Release Notes (or backporting 22.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
  • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
• Fits CONTRIBUTING.md.

[aanderse]

@dwagenk thanks for contributing this. I'll try and get back to it as soon as I can, though I'm going to prioritize getting the new kodi release packaged first. Please be patient with us 🙇‍♂️

[aanderse]

Linking kodi update PR for visibility: #201835

[nvmd]

Proposed changes merged in #304097, thanks!

[dwagenk]

Oh, wow, thank you for updating and getting this merged! 🎉