kodi: remove jre override, use headless
This commit is contained in:
parent
166a0642d4
commit
53c52f1a45
|
@ -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
|
||||
|
@ -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
|
||||
|
|
|
@ -24385,18 +24385,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 {});
|
||||
|
|
Loading…
Reference in a new issue