From 7ca0641e273d773568c7b60c9aae116408aad51f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 17:14:38 +0000 Subject: [PATCH] fbthrift: propagate required dependencies (cherry picked from commit 3dd6e0e71a23a91aaf1f846ef487f6a0e59bc69e) (cherry picked from commit 58e8c1a41f952aa4cb95ddd34e41bf60a42de430) --- pkgs/by-name/fb/fbthrift/package.nix | 8 ++++++-- pkgs/development/libraries/fb303/default.nix | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index fcfc8d8ffdf3..f7a5d630ff12 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -16,9 +16,10 @@ zlib, zstd, xxHash, - mvfst, apple-sdk_11, darwinMinVersionHook, + + mvfst, }: stdenv.mkDerivation (finalAttrs: { @@ -48,13 +49,16 @@ stdenv.mkDerivation (finalAttrs: { zlib zstd xxHash - mvfst ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 (darwinMinVersionHook "11.0") ]; + propagatedBuildInputs = [ + mvfst + ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index 5236e07b77d3..f77979a51e6a 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -6,7 +6,6 @@ , fizz , folly , glog -, mvfst , python3 , wangle }: @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { fizz folly glog - mvfst python3 wangle ];