diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/video/kodi/unwrapped.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/video/kodi/unwrapped.nix | 18 |
1 files changed, 14 insertions, 4 deletions
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 |