public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kodi: remove jre override, use headless

Browse Source
This commit is contained in:
georgewhewell 2020-10-01 11:47:23 +01:00 committed by Frederik Rietdijk
parent 166a0642d4
commit 53c52f1a45
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/kodi/default.nix
View File

@ -3,7 +3,7 @@
, libgcrypt, libgpgerror, libunistring , libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook , boost, avahi, lame, autoreconfHook
, gettext, pcre-cpp, yajl, fribidi, which , gettext, pcre-cpp, yajl, fribidi, which
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre , openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
, libxml2, systemd , libxml2, systemd
, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl , alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl
, libjpeg, libpng, libtiff , libjpeg, libpng, libtiff
@ -211,7 +211,7 @@ in stdenv.mkDerivation {
which which
pkgconfig gnumake pkgconfig gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 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 # for TexturePacker
giflib zlib libpng libjpeg lzo giflib zlib libpng libjpeg lzo

6
pkgs/top-level/all-packages.nix
View File

@ -24385,18 +24385,14 @@ in
gtk = gtk2; gtk = gtk2;
}; };
kodiPlain = callPackage ../applications/video/kodi { kodiPlain = callPackage ../applications/video/kodi { };
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
kodiPlainWayland = callPackage ../applications/video/kodi { kodiPlainWayland = callPackage ../applications/video/kodi {
useWayland = true; useWayland = true;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
kodiGBM = callPackage ../applications/video/kodi { kodiGBM = callPackage ../applications/video/kodi {
useGbm = true; useGbm = true;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});