Commit Graph

22 Commits

Author SHA1 Message Date
Philippe Hürlimann
7d0201dfa6 kodi: use passthru packages in withPackages
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.
2026-04-30 12:02:11 +02:00
Jeremy Fleischman
c07cb1bed4 kodi: inherit underlying kodi's meta when wrapping
kodi has a mainProgram:

```
nix-repl> kodi.meta.mainProgram
"kodi"
```

But when wrapping it, we'd lose its mainProgram:

```
nix-repl> (kodi.withPackages (_: [])).meta.mainProgram
error:
       … while evaluating the attribute 'meta.mainProgram'
       ...

       error: attribute 'mainProgram' missing
       at «string»:1:1:
            1| (kodi.withPackages (_: [])).meta.mainProgram
             | ^
```

This fixes that. Please let me know if there's a better pattern
to follow for inheriting meta information when wrapping. I intentionally
didn't inherit the full `meta` attribute as it has some other
information (such as `position`) that I think are better *not*
inherited.
2026-03-15 19:08:40 -07:00
Wolfgang Walther
91a8fee3aa treewide: remove redundant parentheses
Auto-fixed by nixf-diagnose.
2025-10-05 10:52:03 +02:00
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Jeremy Fleischman
cb720edb7d kodi: More robust handling of kodi webserver assets
This adds a backport of
a6dedce7ba
to Kodi 19.4 Matrix. This can be removed once a new release of Kodi comes
out and we upgrade to it.

What's nice about this approach is that it doesn't special case
webinterface.default. I've never actually tried using a non-default web
interface with Kodi, but I bet it wouldn't have worked before this
change, and I think it would work after this change =)

See and
https://github.com/NixOS/nixpkgs/pull/152675#issuecomment-1003442175 and
https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for some
discussion about this approach.
2022-04-07 21:52:16 -07:00
Jeremy Fleischman
f99cd3fd08 kodi: copy web assets instead of symlinking
Kodi refuses to follow symlinks that lead outside of a small whitelist
of allowed directories. See
[`CFileUtils::CheckFileAccessAllowed`](4ac445c4a9/xbmc/utils/FileUtils.cpp (L252))
for the relevant code.

This feels like a pretty brittle workaround, but I can't think of a
better solution, so I'm going to say that this fixes
https://github.com/NixOS/nixpkgs/issues/145116.
2021-12-30 03:09:48 -08:00
Daniel Wagenknecht
6e170aa758 kodi: fix cross build 2021-12-06 07:34:44 +01:00
Aaron Andersen
acf6abcafc kodi: set proper PYTHONPATH for addons 2021-07-21 10:53:40 -04:00
Aaron Andersen
7a6720beee kodi.withPackages: include pillow and pycryptodome python dependencies 2021-03-15 20:37:52 -04:00
Aaron Andersen
ce0621ec4f kodi: introduce kodi.withPackages to replace kodiPackages.kodiWithAddons 2021-03-11 20:35:54 -05:00
Aaron Andersen
917f7efdc5 kodiPlugins: rename to kodiPackages 2021-03-11 20:35:50 -05:00
Pavol Rusnak
a6ce00c50c treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Ben Siraphob
108bdac3d9 pkgs/applications: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Aaron Andersen
2c4d7f1342 kodi: accept plugins without extraRuntimeDependencies 2020-12-02 20:12:09 -05:00
Minijackson
e1f802dfef kodi: add Wayland support 2019-04-14 20:32:26 -04:00
Stefan Wiehler
6307e2b00f kodiPlugins.inputstream-adaptive: init at 2.3.12 2019-02-19 07:43:01 +01:00
Jan Malakhovski
1d64f70bd7 kodi: wrapper: set PYTHONPATH from plugins 2018-09-06 19:55:55 +00:00
Jan Malakhovski
88d69df250 kodi: wrapper: simplify 2018-09-06 19:55:55 +00:00
Joachim Fasting
52cb1df30c kodi/wrapper: fix typo, preferLocalBuilds -> preferLocalBuild 2016-12-14 03:48:44 +01:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Carles Pagès
5d9148c9ad kodiPlugins.pvr-hts: init at 2.1.18
Add Tvheadend HTSP PVR client addon for Kodi.
2015-12-05 08:42:45 +01:00
Edward Tjörnhammar
8d1657b463 Migrating the XBMC plugin wrapper and plugins to Kodi. 2015-01-19 22:14:36 +01:00