diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix index 6daa39dd7e73..3a634ec17373 100644 --- a/pkgs/tools/misc/torrenttools/default.nix +++ b/pkgs/tools/misc/torrenttools/default.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { ]; sourceRoot = "torrenttools"; + patches = [ + ./fmt-9.patch + ]; + postUnpack = '' cp -pr cliprogress torrenttools/external/cliprogress cp -pr dottorrent torrenttools/external/dottorrent diff --git a/pkgs/tools/misc/torrenttools/fmt-9.patch b/pkgs/tools/misc/torrenttools/fmt-9.patch new file mode 100644 index 000000000000..5bdc666d4bd2 --- /dev/null +++ b/pkgs/tools/misc/torrenttools/fmt-9.patch @@ -0,0 +1,29 @@ +diff --git a/include/file_matcher.hpp b/include/file_matcher.hpp +index c10c7be405..b67baec0ef 100644 +--- a/include/file_matcher.hpp ++++ b/include/file_matcher.hpp +@@ -47,7 +47,7 @@ + } + + std::string error; +- std::string pattern = ".*.{}$"_format(extension); ++ std::string pattern = fmt::format(".*.{}$", extension); + file_include_list_.Add(pattern, &error); + file_include_list_empty_ = false; + Ensures(error.empty()); +@@ -62,7 +62,7 @@ + } + + std::string error; +- std::string pattern = ".*\\.{}$"_format(extension); ++ std::string pattern = fmt::format(".*\\.{}$", extension); + file_exclude_list_.Add(pattern, &error); + file_exclude_list_empty_ = false; + Ensures(error.empty()); +@@ -243,4 +243,4 @@ + }; + + +-} // namespace torrenttools +\ No newline at end of file ++} // namespace torrenttools diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa116a3908ae..2649ac69fdbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16008,7 +16008,7 @@ with pkgs; }; torrenttools = callPackage ../tools/misc/torrenttools { - fmt = fmt_8; + fmt = fmt_9; }; tony = libsForQt5.callPackage ../applications/audio/tony { };