From 4fc612be9dc733aff5157a635aaf75b62c013b04 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 12:40:43 +0000 Subject: [PATCH] folly: reorder inputs to match upstream file (cherry picked from commit 7ae3a8ada67d2dff01b1d5e60c0333fd08c938a4) (cherry picked from commit 383254a33b79d270994659b1c4161c46abe85247) --- pkgs/by-name/fo/folly/package.nix | 32 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index b12cab0d390d..0ca78d23bb17 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -1,25 +1,29 @@ { lib, stdenv, + fetchFromGitHub, - boost, + cmake, + pkg-config, + + boost, double-conversion, - fmt_8, gflags, glog, libevent, + zlib, + openssl, + xz, + lz4, + zstd, libiberty, libunwind, - lz4, - openssl, - pkg-config, - xz, - zlib, - zstd, + fmt_8, jemalloc, apple-sdk_11, darwinMinVersionHook, + follyMobile ? false, # for passthru.tests @@ -54,17 +58,17 @@ stdenv.mkDerivation (finalAttrs: { [ boost double-conversion - glog gflags + glog libevent - libiberty - openssl - lz4 - xz zlib + openssl + xz + lz4 + zstd + libiberty libunwind fmt_8 - zstd ] ++ lib.optional stdenv.hostPlatform.isLinux jemalloc ++ lib.optionals stdenv.hostPlatform.isDarwin [