From 03b58e14f792db6acbed43439281561dcfe92d7f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 17:14:38 +0000
Subject: [PATCH] fizz: propagate required dependencies

---
 pkgs/by-name/fi/fizz/package.nix                | 16 ++++++++++------
 pkgs/development/libraries/fb303/default.nix    |  4 ----
 pkgs/development/libraries/fbthrift/default.nix |  2 --
 pkgs/development/libraries/mvfst/default.nix    |  4 ----
 pkgs/development/libraries/wangle/default.nix   |  4 ----
 pkgs/development/tools/watchman/default.nix     |  2 --
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix
index d7373cc1e178..19d78dee6ead 100644
--- a/pkgs/by-name/fi/fizz/package.nix
+++ b/pkgs/by-name/fi/fizz/package.nix
@@ -7,18 +7,19 @@
   cmake,
   ninja,
 
-  folly,
   openssl,
   glog,
   double-conversion,
   zstd,
-  libsodium,
   gflags,
-  zlib,
   libevent,
   apple-sdk_11,
   darwinMinVersionHook,
 
+  folly,
+  libsodium,
+  zlib,
+
   gtest,
 }:
 
@@ -40,14 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
-      folly
       openssl
       glog
       double-conversion
       zstd
-      libsodium
       gflags
-      zlib
       libevent
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -55,6 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
       (darwinMinVersionHook "11.0")
     ];
 
+  propagatedBuildInputs = [
+    folly
+    libsodium
+    zlib
+  ];
+
   checkInputs = [
     gtest
   ];
diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix
index 9ed38b615cae..5236e07b77d3 100644
--- a/pkgs/development/libraries/fb303/default.nix
+++ b/pkgs/development/libraries/fb303/default.nix
@@ -6,11 +6,9 @@
 , fizz
 , folly
 , glog
-, libsodium
 , mvfst
 , python3
 , wangle
-, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -36,11 +34,9 @@ stdenv.mkDerivation rec {
     fizz
     folly
     glog
-    libsodium
     mvfst
     python3
     wangle
-    zlib
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix
index 2d897613dfe5..ad0173b458b4 100644
--- a/pkgs/development/libraries/fbthrift/default.nix
+++ b/pkgs/development/libraries/fbthrift/default.nix
@@ -4,7 +4,6 @@
 , bison
 , libevent
 , double-conversion
-, libsodium
 , fizz
 , flex
 , folly
@@ -55,7 +54,6 @@ stdenv.mkDerivation rec {
     wangle
     zlib
     zstd
-    libsodium
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix
index aee41d09afaf..f99fc041ab97 100644
--- a/pkgs/development/libraries/mvfst/default.nix
+++ b/pkgs/development/libraries/mvfst/default.nix
@@ -6,8 +6,6 @@
 , folly
 , gflags
 , glog
-, libsodium
-, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -32,8 +30,6 @@ stdenv.mkDerivation rec {
     folly
     gflags
     glog
-    libsodium
-    zlib
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix
index 140bda3f631c..c1209e0ee800 100644
--- a/pkgs/development/libraries/wangle/default.nix
+++ b/pkgs/development/libraries/wangle/default.nix
@@ -10,8 +10,6 @@
 , fizz
 , folly
 , gtest
-, libsodium
-, zlib
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,8 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libsodium
-    zlib
     double-conversion
     fizz
     folly
diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index d2ea2ed6ba0d..0a928810eb68 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -27,7 +27,6 @@
 , stateDir ? "/tmp"
 , stdenv
 , wangle
-, zlib
 , zstd
 }:
 
@@ -67,7 +66,6 @@ stdenv.mkDerivation rec {
     glog
     libevent
     libsodium
-    zlib
     folly
     fizz
     wangle