fizz: propagate required dependencies

2024-11-18 17:42:43 +00:00
parent 136740dec6
commit 03b58e14f7
6 changed files with 10 additions and 22 deletions
@@ -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
  ];
@@ -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; {
@@ -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; {
@@ -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; {
@@ -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
@@ -27,7 +27,6 @@
 , stateDir ? "/tmp"
 , stdenv
 , wangle
-, zlib
 , zstd
 }:

@@ -67,7 +66,6 @@ stdenv.mkDerivation rec {
    glog
    libevent
    libsodium
-    zlib
    folly
    fizz
    wangle