From 593f78887a31e513b07aa0bd0a3edb2b74d4e3aa Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 13:40:54 +0000 Subject: [PATCH] folly: reorder attributes --- pkgs/by-name/fo/folly/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index edcea827a46d..b12cab0d390d 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; version = "2024.03.11.00"; + # split outputs to reduce downstream closure sizes + outputs = [ + "out" + "dev" + ]; + src = fetchFromGitHub { owner = "facebook"; repo = "folly"; @@ -69,11 +75,6 @@ stdenv.mkDerivation (finalAttrs: { # jemalloc headers are required in include/folly/portability/Malloc.h propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux jemalloc; - env.NIX_CFLAGS_COMPILE = toString [ - "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" - "-fpermissive" - ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" @@ -87,10 +88,9 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_LIBDIR=lib" ]; - # split outputs to reduce downstream closure sizes - outputs = [ - "out" - "dev" + env.NIX_CFLAGS_COMPILE = toString [ + "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" + "-fpermissive" ]; # patch prefix issues again