From eab5ca3e51d4315ef0672430eb06aabdef168fcf Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 13:43:34 +0000 Subject: [PATCH] folly: remove obsolete AArch64 hack (cherry picked from commit 3352d4f1ab484923e31f86a2969e6c8442efd964) (cherry picked from commit da0502a94ace2c402892ed389aae89c50b814b5e) --- pkgs/by-name/fo/folly/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 626dd800ce91..809f62eb5d14 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -88,10 +88,6 @@ stdenv.mkDerivation (finalAttrs: { 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.hostPlatform.isx86_64 then "x86_64" else "dummy"}" - # Folly uses these instead of the standard CMake variables for some reason. (lib.cmakeFeature "INCLUDE_INSTALL_DIR" "${placeholder "dev"}/include") (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib")