Merge commit '683c68232e91f76386db979c461d8fbe2a018782'

1 files changed, 21 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix
index 17aab0c8a34e..4741a3d156a5 100644
--- a/nixpkgs/pkgs/development/libraries/fmt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix
@@ -1,17 +1,34 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "fmt";
-  version = "6.1.2";
+  version = "6.2.0";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "fmtlib";
     repo = "fmt";
     rev = version;
-    sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi";
+    sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs";
   };
 
-  outputs = [ "out" "dev" ];
+  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=";
+    })
+
+    # Fix paths in pkg-config file
+    # https://github.com/fmtlib/fmt/pull/1657
+    (fetchpatch {
+      url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch";
+      sha256 = "hjE6Q/ubA4UhvuJXgcsA3wiGoDK031P19njQRL9JF8M=";
+    })
+  ];
 
   nativeBuildInputs = [ cmake ];