BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kodi: drop wrapKodi function and disregard config.kodi.* options

Browse source
This commit is contained in:
Aaron Andersen 2021-03-09 22:47:47 -05:00
parent f8f037b51d
commit 587a8b2837
3 changed files with 12 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/video/kodi/packages.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, callPackage, fetchFromGitHub
, cmake, kodiPlain, libcec_platform, tinyxml, pugixml
, cmake, kodi, libcec_platform, tinyxml, pugixml
, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib
, python3Packages, expat, glib, nspr, nss, openssl
, libssh, libarchive, lzma, bzip2, lz4, lzo }:
@ -11,7 +11,7 @@ let self = rec {
addonDir = "/share/kodi/addons";
rel = "Matrix";
kodi = kodiPlain;
inherit kodi;
# Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
toKodiAddon = drv: drv.overrideAttrs(oldAttrs: {
@ -30,11 +30,6 @@ let self = rec {
modules = filter hasKodiAddon drvs;
in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
kodiWithAddons = func: callPackage ./wrapper.nix {
inherit kodi;
addons = requiredKodiAddons (func self);
};
kodi-platform = stdenv.mkDerivation rec {
project = "kodi-platform";
version = "17.1";
@ -48,7 +43,7 @@ let self = rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ kodiPlain libcec_platform tinyxml ];
buildInputs = [ kodi libcec_platform tinyxml ];
};
buildKodiAddon =
@ -86,7 +81,7 @@ let self = rec {
dontStrip = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs;
buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
inherit extraRuntimeDependencies;

3
pkgs/top-level/aliases.nix
View file

@ -303,6 +303,9 @@ mapAliases ({
json_glib = json-glib; # added 2018-02-25
kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
kodiGBM = kodi-gbm;
kodiPlain = kodi;
kodiPlainWayland = kodi-wayland;
julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28

49
pkgs/top-level/all-packages.nix
View file

@ -26170,33 +26170,6 @@ in
cores = retroArchCores;
};
wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix {
inherit kodi;
addons = let inherit (lib) optional optionals; in with kodiPackages;
([]
++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher
++ optional (config.kodi.enableAdvancedEmulatorLauncher or false)
advanced-emulator-launcher
++ optionals (config.kodi.enableControllers or false)
(with controllers;
[ default dreamcast gba genesis mouse n64 nes ps snes ])
++ optional (config.kodi.enableExodus or false) exodus
++ optionals (config.kodi.enableHyperLauncher or false)
(with hyper-launcher; [ plugin service pdfreader ])
++ optional (config.kodi.enableJoystick or false) joystick
++ optional (config.kodi.enableOSMCskin or false) osmc-skin
++ optional (config.kodi.enableSVTPlay or false) svtplay
++ optional (config.kodi.enableSteamController or false) steam-controller
++ optional (config.kodi.enableSteamLauncher or false) steam-launcher
++ optional (config.kodi.enablePVRHTS or false) pvr-hts
++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun
++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple
++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive
++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp
++ optional (config.kodi.enableVFSLibarchive or false) vfs-libarchive
);
};
wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
wxhexeditor = callPackage ../applications/editors/wxhexeditor {
@ -26254,30 +26227,18 @@ in
gtk = gtk2;
};
kodiPlain = callPackage ../applications/video/kodi/unwrapped.nix { };
kodiPackages = recurseIntoAttrs (callPackage ../applications/video/kodi/packages.nix {});
kodiPlainWayland = callPackage ../applications/video/kodi/unwrapped.nix {
kodi = callPackage ../applications/video/kodi/unwrapped.nix { };
kodi-wayland = callPackage ../applications/video/kodi/unwrapped.nix {
useWayland = true;
};
kodiGBM = callPackage ../applications/video/kodi/unwrapped.nix {
kodi-gbm = callPackage ../applications/video/kodi/unwrapped.nix {
useGbm = true;
};
kodiPackages = recurseIntoAttrs (callPackage ../applications/video/kodi/packages.nix {});
kodi = wrapKodi {
kodi = kodiPlain;
};
kodi-wayland = wrapKodi {
kodi = kodiPlainWayland;
};
kodi-gbm = wrapKodi {
kodi = kodiGBM;
};
kodi-cli = callPackage ../tools/misc/kodi-cli { };
kodi-retroarch-advanced-launchers =