From 6088824eee448ea6dfda4084bd66c1326f3d2760 Mon Sep 17 00:00:00 2001 From: squalus Date: Sun, 15 May 2022 01:06:46 -0700 Subject: [PATCH] folly: fix build - fix build by adding -fpermissive cflag - add aarch64-linux to supported platforms --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index dfc194f1d4c..c3fe3ba2ce7 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { zstd ]; - NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" ]; + NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with lib; { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; maintainers = with maintainers; [ abbradar pierreis ]; }; }