Skip to content

kodi: remove jre override, use jre_headless #99255

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.

Sign up for GitHub

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

Merged
FRidh merged 1 commit into from
Oct 25, 2020
Merged

kodi: remove jre override, use jre_headless #99255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/video/kodi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook
, gettext, pcre-cpp, yajl, fribidi, which
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
, libxml2, systemd
, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl
, libjpeg, libpng, libtiff
Expand Down Expand Up @@ -211,7 +211,7 @@ in stdenv.mkDerivation {
which
pkgconfig gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
jre yasm gettext python2Packages.python flatbuffers
jre_headless yasm gettext python2Packages.python flatbuffers

# for TexturePacker
giflib zlib libpng libjpeg lzo
Expand Down
6 changes: 1 addition & 5 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24254,18 +24254,14 @@ in
gtk = gtk2;
};

kodiPlain = callPackage ../applications/video/kodi {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
kodiPlain = callPackage ../applications/video/kodi { };

kodiPlainWayland = callPackage ../applications/video/kodi {
useWayland = true;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};

kodiGBM = callPackage ../applications/video/kodi {
useGbm = true;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};

kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
Expand Down