mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 18:33:00 +00:00
folly: bump to fmt_11
This is the version used upstream.
(cherry picked from commit bba7126b28
)
This commit is contained in:
parent
31e3056413
commit
7fbdc96f7b
@ -25,7 +25,7 @@
|
||||
darwinMinVersionHook,
|
||||
|
||||
boost,
|
||||
fmt_8,
|
||||
fmt_11,
|
||||
jemalloc,
|
||||
|
||||
follyMobile ? false,
|
||||
@ -75,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zstd
|
||||
libiberty
|
||||
libunwind
|
||||
fmt_8
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
@ -86,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
# `folly-config.cmake` pulls these in.
|
||||
boost
|
||||
fmt_8
|
||||
fmt_11
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
# jemalloc headers are required in include/folly/portability/Malloc.h
|
||||
@ -138,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
inherit boost;
|
||||
fmt = fmt_8;
|
||||
fmt = fmt_11;
|
||||
|
||||
tests = {
|
||||
inherit watchman;
|
||||
|
Loading…
Reference in New Issue
Block a user