From 26008b4611d77bb9e3d3726f758604cfd9975365 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 15:58:20 +0000 Subject: [PATCH] fbthrift: reorder inputs to match upstream file --- pkgs/by-name/fb/fbthrift/package.nix | 39 ++++++++++++++++------------ 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index c1f330335e53..7a6189585ad4 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -1,22 +1,26 @@ { + lib, stdenv, + fetchFromGitHub, + cmake, bison, - libevent, - double-conversion, - fizz, flex, - folly, - glog, - gflags, - libiberty, - mvfst, + openssl, - lib, + gflags, + glog, + folly, + fizz, wangle, zlib, zstd, + mvfst, + double-conversion, + libevent, + libiberty, + libsodium, apple-sdk_11, darwinMinVersionHook, }: @@ -40,18 +44,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - double-conversion - fizz - folly - glog - gflags - libevent - libiberty - mvfst openssl + gflags + glog + folly + fizz wangle zlib zstd + mvfst + double-conversion + libevent + libiberty + libsodium ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11