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: remove jre override, use jre_headless #99255

Merged
merged 1 commit into from Oct 25, 2020

Conversation

@georgewhewell
Copy link
Contributor

@georgewhewell georgewhewell commented Oct 1, 2020

Since #89731 is merged we can remove jre override on kodi builds.

Also, we can use headless build which reduce dependency tree a bit, useful for ARM platforms

tested on x86

Motivation for this change

reduce dependency tree on ARM

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@andir
Copy link
Member

@andir andir commented Oct 1, 2020

This is also an update from jre8 to 14. Is that intended? Any downsides with that? I can only test if it compiles but thought it might be worth mentioning.

@aanderse
Copy link
Member

@aanderse aanderse commented Oct 1, 2020

I don't think java is used for much in kodi. I think it is just bluray support maybe... a quick search says:

https://forums.gentoo.org/viewtopic-t-1089736-start-0.html

Kodi only uses Java at build time to generate some files. It does not use it at runtime. I understand that, but something else might use it if it detects it, browsers etc.

I'm not too concerned about the bump 🤷‍♂️

Maybe @peterhoeg would like to comment.

@georgewhewell
Copy link
Contributor Author

@georgewhewell georgewhewell commented Oct 1, 2020

This is also an update from jre8 to 14. Is that intended? Any downsides with that? I can only test if it compiles but thought it might be worth mentioning.

since it compiles + runs it seems happy with 14 (and as @aanderse say its just build-time dependency)

@andir
andir approved these changes Oct 1, 2020
@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Oct 2, 2020

@georgewhewell - ofborg doesn't evaluate kodi on arm64 but since that's what you are specifically targeting with this PR, is there any chance you could massage that into happening?

@lheckemann
Copy link
Member

@lheckemann lheckemann commented Oct 3, 2020

@peterhoeg this is an error happening on ofborg aarch64 evals generally recently, not related to these changes.

@FRidh FRidh merged commit 53c52f1 into NixOS:master Oct 25, 2020
19 checks passed
19 checks passed
@github-actions
tests tests
Details
@github-actions
action
Details
@ofborg
kodi, kodi.passthru.tests on aarch64-linux No attempt
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e55b0b"; rev="7e55b0b95c6b85feb36098920b6791f461957ef4"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e55b0b"; rev="7e55b0b95c6b85feb36098920b6791f461957ef4"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e55b0b"; rev="7e55b0b95c6b85feb36098920b6791f461957ef4"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e55b0b"; rev="7e55b0b95c6b85feb36098920b6791f461957ef4"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e55b0b"; rev="7e55b0b95c6b85feb36098920b6791f461957ef4"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e55b0b"; rev="7e55b0b95c6b85feb36098920b6791f461957ef4"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7e55b0b"; rev="7e55b0b95c6b85feb36098920b6791f461957ef4"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg
kodi, kodi.passthru.tests on x86_64-linux Success
Details
@georgewhewell georgewhewell deleted the georgewhewell:kodi-jre-headless branch Oct 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants