From 08d634a7a0aadd5d2f2c26439878c39947e4ab98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2020 03:12:20 +0000
Subject: [PATCH] fmt: 6.1.2 -> 6.2.0
---
pkgs/development/libraries/fmt/default.nix | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 17aab0c8a34..42e1a252a76 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,16 +1,26 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
pname = "fmt";
- version = "6.1.2";
+ version = "6.2.0";
src = fetchFromGitHub {
owner = "fmtlib";
repo = "fmt";
rev = version;
- sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi";
+ sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs";
};
+ patches = [
+ # Fix BC break breaking Kodi
+ # https://github.com/xbmc/xbmc/issues/17629
+ # https://github.com/fmtlib/fmt/issues/1620
+ (fetchpatch {
+ url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch";
+ sha256 = "vdttRGgdltabeRAs4/z0BNtW2dLOhCxtXQFGVFKpEG0=";
+ })
+ ];
+
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];