about summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2023-06-30 03:28:02 +0900
committerDominique Martinet <asmadeus@codewreck.org>2023-08-12 06:56:25 +0900
commit8563252c01ae28c60b9525ca6fb4933b430cf079 (patch)
treebdcc17b2b6a93106f70dd7e4be3ebd87614d071f /pkgs/applications/video
parentce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e (diff)
downloadnixlib-8563252c01ae28c60b9525ca6fb4933b430cf079.tar
nixlib-8563252c01ae28c60b9525ca6fb4933b430cf079.tar.gz
nixlib-8563252c01ae28c60b9525ca6fb4933b430cf079.tar.bz2
nixlib-8563252c01ae28c60b9525ca6fb4933b430cf079.tar.lz
nixlib-8563252c01ae28c60b9525ca6fb4933b430cf079.tar.xz
nixlib-8563252c01ae28c60b9525ca6fb4933b430cf079.tar.zst
nixlib-8563252c01ae28c60b9525ca6fb4933b430cf079.zip
kodi: fix build with fmt10
kodi doesn't build with libfmt_10, which it pulls indirectly from spdlog

We could make a spdlog variant with libfmt_9 but that compilation
problem is already fixed upstream (PR still open), so just backport that
PR until we get a new release

Link: https://github.com/xbmc/xbmc/pull/23453
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/kodi/unwrapped.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index fd11a46dcd2b..bb2c34083515 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -1,4 +1,5 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
+, fetchpatch
 , pkg-config, cmake, yasm, python3Packages
 , libxcrypt, libgcrypt, libgpg-error, libunistring
 , boost, avahi, lame
@@ -110,7 +111,15 @@ in stdenv.mkDerivation {
     version = kodiVersion;
 
     src = kodi_src;
-
+    patches = [
+      # Fix compatiblity with fmt 10.0 (from spdlog).
+      # Remove with the next release: https://github.com/xbmc/xbmc/pull/23453
+      (fetchpatch {
+        name = "Fix fmt10 compat";
+        url = "https://github.com/xbmc/xbmc/pull/23453.patch";
+        hash = "sha256-zMUparbQ8gfgeXj8W3MDmPi5OgLNz/zGCJINU7H6Rx0=";
+      })
+    ];
     buildInputs = [
       gnutls libidn2 libtasn1 nasm p11-kit
       libxml2 python3Packages.python