folly: propagate required dependencies

(cherry picked from commit fb3b469558)

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;
 

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

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
   ];
 

pkgs/development/libraries/fb303/default.nix

@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
     fbthrift
     fizz
     folly
-    folly.boost
-    folly.fmt
     glog
     libsodium
     mvfst

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

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

pkgs/development/libraries/mvfst/default.nix

@@ -30,8 +30,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     fizz
     folly
-    folly.boost
-    folly.fmt
     gflags
     glog
     libsodium

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

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