Merge pull request #173111 from squalus/folly

folly: fix build
This commit is contained in:
Robert Scott
2022-05-16 22:17:12 +01:00
committed by GitHub
+2 -2
View File
@@ -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 ];
};
}