From 79dfe3a864359caa295d87a8e39d0d01755eeefd Mon Sep 17 00:00:00 2001 From: Andrew Hamon Date: Wed, 8 Feb 2023 22:33:11 -0800 Subject: [PATCH] folly: fix build on aarch64-linux --- pkgs/development/libraries/folly/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 78d280b99133..f1da52154531 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , boost , cmake @@ -57,7 +58,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + + # temporary hack until folly builds work on aarch64, + # see https://github.com/facebook/folly/issues/1880 + "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" + ]; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/libfolly.pc \