diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
commit | 03de4c02fbd35d1b730ba0957f71df9a7a82bacf (patch) | |
tree | 78ed2f7dfa2efae85c9a76dd53320d875a8ff678 /pkgs/development/libraries/fmt/default.nix | |
parent | 99d25675152f30caf6354db93f01fac87f640c8f (diff) | |
parent | e27e3ae169d4ac64856befb6bbf044f2153e337d (diff) | |
download | nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.gz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.bz2 nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.lz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.xz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.zst nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/fmt/default.nix')
-rw-r--r-- | pkgs/development/libraries/fmt/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 4741a3d156a5..856553c6ded8 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "fmt"; - version = "6.2.0"; + version = "6.2.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs"; + sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic"; }; patches = [ @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; sha256 = "hjE6Q/ubA4UhvuJXgcsA3wiGoDK031P19njQRL9JF8M="; }) + + # Fix cmake config paths. + (fetchpatch { + url = "https://github.com/fmtlib/fmt/pull/1702.patch"; + sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3"; + }) ]; nativeBuildInputs = [ cmake ]; |