diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index b21a2ad50466..4716e53701f1 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -9,7 +9,6 @@ pkg-config, removeReferencesTo, - boost, double-conversion, fast-float, gflags, @@ -22,11 +21,13 @@ zstd, libiberty, libunwind, - fmt_8, - jemalloc, apple-sdk_11, darwinMinVersionHook, + boost, + fmt_8, + jemalloc, + follyMobile ? false, # for passthru.tests @@ -76,14 +77,21 @@ stdenv.mkDerivation (finalAttrs: { libunwind fmt_8 ] - ++ lib.optional stdenv.hostPlatform.isLinux jemalloc ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 (darwinMinVersionHook "11.0") ]; - # jemalloc headers are required in include/folly/portability/Malloc.h - propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux jemalloc; + propagatedBuildInputs = + [ + # `folly-config.cmake` pulls these in. + boost + fmt_8 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # jemalloc headers are required in include/folly/portability/Malloc.h + jemalloc + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) @@ -129,8 +137,6 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - # folly-config.cmake, will `find_package` these, thus there should be - # a way to ensure abi compatibility. inherit boost; fmt = fmt_8; diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix index f07734928bf9..f8c23aa04bbc 100644 --- a/pkgs/by-name/wd/wdt/package.nix +++ b/pkgs/by-name/wd/wdt/package.nix @@ -3,12 +3,10 @@ , fetchFromGitHub , cmake , folly -, boost , gflags , glog , openssl , double-conversion -, fmt , unstableGitUpdater }: @@ -24,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ folly boost gflags glog openssl double-conversion fmt ]; + buildInputs = [ folly gflags glog openssl double-conversion ]; # source is expected to be named wdt # https://github.com/facebook/wdt/blob/43319e59d0c77092468367cdadab37d12d7a2383/CMakeLists.txt#L238 diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix index ce26bc6f7125..9abd387a9d92 100644 --- a/pkgs/development/libraries/edencommon/default.nix +++ b/pkgs/development/libraries/edencommon/default.nix @@ -1,9 +1,7 @@ { stdenv , lib , fetchFromGitHub -, boost , cmake -, fmt_8 , folly , glog , gtest @@ -34,8 +32,6 @@ stdenv.mkDerivation rec { buildInputs = [ glog folly - fmt_8 - boost gtest ]; diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index 659497d690f6..9ed38b615cae 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { fbthrift fizz folly - folly.boost - folly.fmt glog libsodium mvfst diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index 04bce085c088..2d897613dfe5 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -2,13 +2,11 @@ , fetchFromGitHub , cmake , bison -, boost , libevent , double-conversion , libsodium , fizz , flex -, fmt_8 , folly , glog , gflags @@ -45,10 +43,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost double-conversion fizz - fmt_8 folly glog gflags diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index 4c38c54316b7..d53611cdc29f 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -1,12 +1,10 @@ { stdenv , fetchFromGitHub , cmake -, boost , libevent , double-conversion , glog , lib -, fmt_8 , zstd , gflags , libiberty @@ -42,8 +40,6 @@ stdenv.mkDerivation (finalAttrs: { NIX_LDFLAGS = "-lz"; buildInputs = [ - fmt_8 - boost double-conversion folly glog diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix index 7c9d2e8da445..aee41d09afaf 100644 --- a/pkgs/development/libraries/mvfst/default.nix +++ b/pkgs/development/libraries/mvfst/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { buildInputs = [ fizz folly - folly.boost - folly.fmt gflags glog libsodium diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index d07145641a70..140bda3f631c 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -2,11 +2,9 @@ , lib , fetchFromGitHub , cmake -, boost , libevent , double-conversion , glog -, fmt_8 , gflags , openssl , fizz @@ -39,10 +37,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fmt_8 libsodium zlib - boost double-conversion fizz folly diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index aa915d89c7fa..d2ea2ed6ba0d 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,5 +1,4 @@ -{ boost -, cargo +{ cargo , cmake , CoreServices , cpptoml @@ -11,7 +10,6 @@ , fetchFromGitHub , fetchpatch , fizz -, fmt_8 , folly , glog , gtest @@ -67,9 +65,7 @@ stdenv.mkDerivation rec { openssl gtest glog - boost libevent - fmt_8 libsodium zlib folly