diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/applications/video/kodi | |
parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/applications/video/kodi')
-rw-r--r-- | nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/video/kodi/unwrapped.nix | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix index 7f03d813388d..890567d5d6d5 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix @@ -20,6 +20,6 @@ buildKodiAddon rec { homepage = "https://github.com/mediathekview/plugin.video.mediathekview"; description = "Access media libraries of German speaking broadcasting stations"; license = licenses.mit; - maintainers = teams.kodi.members ++ [ lib.maintainers.dschrempf ]; + maintainers = teams.kodi.members; }; } diff --git a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index ec84aa9ff6b3..f97b53b60937 100644 --- a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub +, fetchpatch +, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -39,15 +41,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20240109"; - kodiVersion = "20.3"; + kodiReleaseDate = "20240302"; + kodiVersion = "20.5"; rel = "Nexus"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - hash = "sha256-OMm8WhTQiEZvu8jHOUp2zT4Xd4NU3svMobW2k8AAtNI="; + hash = "sha256-R/tzk3ZarJ4BTR312p2lTLezeCEsqdQH54ROsNIoJZA="; }; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies @@ -63,6 +65,14 @@ let rev = "${version}-${rel}-Alpha1"; sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII="; }; + patches = [ + # Backport fix for binutils-2.41. + (fetchpatch { + name = "binutils-2.41.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; + hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; + }) + ]; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt |