Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kodi: implement kodiWithPlugins, add more plugins #46196

Merged
merged 6 commits into from Sep 8, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Sep 6, 2018

Motivation for this change

I tried to add YATP to Kodi, ended up rewriting a bunch of stuff.

Known issues

I did not touch wrapKodi and the default wrapped kodi, but, really, we should probably deprecate and then remove it.

Things done
  • It builds.
  • Both old kodi with its configuration via nixpkgs.config and the new kodiWithPlugins work.

Don't merge sooner than 2018-09-09 23:59 UTC. Merge at will.

@oxij
Copy link
Member Author

oxij commented Sep 6, 2018

/cc @titanous @edwtjo @cpages @worldofpeace from git-blame of kodiPlugins
/cc @edolstra because I reverted a tiny piece of yours here

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: kodi, kodiPlugins.simpleplugin, kodiPlugins.yatp

The following builds were skipped because they don't evaluate on x86_64-linux: kodiPlugins.steam-launcher

Partial log (click to expand)

building
no Makefile, doing nothing
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0v7q2iifi2j10yfln9bkfa9h9j9ibcsy-kodi-plugin-yatp-3.3.2
patching script interpreter paths in /nix/store/0v7q2iifi2j10yfln9bkfa9h9j9ibcsy-kodi-plugin-yatp-3.3.2
checking for references to /build in /nix/store/0v7q2iifi2j10yfln9bkfa9h9j9ibcsy-kodi-plugin-yatp-3.3.2...
/nix/store/n90qpxp56f81k6s94hakrbndwv8c0flc-kodi-with-plugins-17.6
/nix/store/h51bg87wk936qlm7d0n53k165aif6zbg-kodi-plugin-simpleplugin-2.3.2
/nix/store/0v7q2iifi2j10yfln9bkfa9h9j9ibcsy-kodi-plugin-yatp-3.3.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: kodiPlugins.simpleplugin, kodiPlugins.yatp

The following builds were skipped because they don't evaluate on aarch64-linux: kodi, kodiPlugins.steam-launcher

Partial log (click to expand)

no configure script, doing nothing
building
no Makefile, doing nothing
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/fy0xvhfd5zk7gmrllwzcxhgqjqrh9jhm-kodi-plugin-yatp-3.3.2
patching script interpreter paths in /nix/store/fy0xvhfd5zk7gmrllwzcxhgqjqrh9jhm-kodi-plugin-yatp-3.3.2
checking for references to /build in /nix/store/fy0xvhfd5zk7gmrllwzcxhgqjqrh9jhm-kodi-plugin-yatp-3.3.2...
/nix/store/jvxdq68dlcy878gd0gppkd84nfalf65w-kodi-plugin-simpleplugin-2.3.2
/nix/store/fy0xvhfd5zk7gmrllwzcxhgqjqrh9jhm-kodi-plugin-yatp-3.3.2

@xeji
Copy link
Contributor

xeji commented Sep 7, 2018

with 3.8k rebuilds this should go to staging.

@oxij
Copy link
Member Author

oxij commented Sep 7, 2018 via email

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: kodi, kodiPlugins.steam-launcher

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: kodi

The following builds were skipped because they don't evaluate on x86_64-linux: kodiPlugins.steam-launcher

Partial log (click to expand)

copying path '/nix/store/l7l9j7y4haayli2qw0fs90w6j8kg4m90-bluez-5.50' from 'https://cache.nixos.org'...
copying path '/nix/store/5qykkwx1xx2zsr3vnirhvw60ahrn91iw-xf86miscproto-0.9.3' from 'https://cache.nixos.org'...
copying path '/nix/store/76xzpl5q63y2cf2xrl8q8hfh03dgsy55-cwiid-2010-02-21-git' from 'https://cache.nixos.org'...
copying path '/nix/store/x40l832fzx6xjlwczhlddcnfjaqvv0pm-libXxf86misc-1.0.3' from 'https://cache.nixos.org'...
copying path '/nix/store/hmx9ryz40xxhf60g18mx199qcvi7b2gr-yajl-2.1.0' from 'https://cache.nixos.org'...
copying path '/nix/store/js6ll6kcxwcjid92zhwwsd508cvvv7rn-xdpyinfo-1.3.2' from 'https://cache.nixos.org'...
copying path '/nix/store/v7kr9w76qfhm5h7hchvarw1k95v4b7ws-kodi-17.6' from 'https://cache.nixos.org'...
building '/nix/store/j27ma3apd2zyjdpv9najrasqmsqd6hgx-kodi-with-plugins-17.6.drv'...
created 6 symlinks in user environment
/nix/store/n90qpxp56f81k6s94hakrbndwv8c0flc-kodi-with-plugins-17.6

@oxij
Copy link
Member Author

oxij commented Sep 8, 2018

I've rebuilt everything (with mass-rebuild YATP patches included) on top of this revision. I can see no issues.

LGTM. Merge at will.

@xeji xeji merged commit d2ab091 into NixOS:master Sep 8, 2018
@oxij
Copy link
Member Author

oxij commented Sep 8, 2018

@xeji Thanks!

@oxij oxij mentioned this pull request Sep 8, 2018
1 task
@oxij
Copy link
Member Author

oxij commented Sep 8, 2018

Changes to plugins: #46403.

oxij added a commit to oxij/nixpkgs that referenced this pull request Nov 7, 2018
No loner exists, I couldn't find an official replacement repo, should be
removed according to
NixOS#46196 (comment)
@oxij oxij deleted the pkgs/kodi-with-plugins branch November 18, 2018 08:56
FRidh pushed a commit that referenced this pull request Nov 18, 2018
No loner exists, I couldn't find an official replacement repo, should be
removed according to
#46196 (comment)
sephalon pushed a commit to sephalon/nixpkgs that referenced this pull request Jan 23, 2019
No loner exists, I couldn't find an official replacement repo, should be
removed according to
NixOS#46196 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants