diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-02-07 09:31:47 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-02-07 20:37:38 +0000 |
| commit | ce68b8998fe4fa834c41c8866875cdd2c9d1d10a (patch) | |
| tree | 625251e4ee79d730764eef88900f64cba0ace3d5 /pkgs/applications/video/kodi | |
| parent | 8f42ee751238c6b8fdd227df330bcc47b5853fae (diff) | |
kodi: backport binutils-2.41 fix for bundled ffmpeg
Diffstat (limited to 'pkgs/applications/video/kodi')
| -rw-r--r-- | pkgs/applications/video/kodi/unwrapped.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 0728fb73bb262..01ebeb3407d8b 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/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 @@ -62,6 +64,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 |