diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-05-16 22:17:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 22:17:12 +0100 |
| commit | 00f85ab585ae13be5f1d2f4a48848801f3d2d184 (patch) | |
| tree | 4037bc72a4b484259a54db21b08c86986c1b7b1d | |
| parent | b33ddb4bbe66c33d6cfb3ec7978429868e0c004d (diff) | |
| parent | 6088824eee448ea6dfda4084bd66c1326f3d2760 (diff) | |
Merge pull request #173111 from squalus/folly
folly: fix build
| -rw-r--r-- | pkgs/development/libraries/folly/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index dfc194f1d4cda..c3fe3ba2ce76a 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 ]; }; } |