From c7f9508a3054236a7abacef97c001b005c8f69a8 Mon Sep 17 00:00:00 2001 From: Ross Carter Date: Thu, 29 Oct 2026 20:28:40 -0400 Subject: [PATCH] folly: fix cross compilation --- pkgs/by-name/fo/folly/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 58d4e35319f7..02cabfb84033 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -8,6 +8,7 @@ cmake, ninja, pkg-config, + buildPackages, double-conversion, fast-float, @@ -106,7 +107,14 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib") (lib.cmakeFeature "CMAKE_INSTALL_DIR" "${placeholder "dev"}/lib/cmake/folly") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "dev")) - ]; + ] + ++ + lib.optionals + ( + !stdenv.buildPlatform.canExecute stdenv.hostPlatform + && stdenv.hostPlatform.emulatorAvailable buildPackages + ) + [ (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages)) ]; env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( [