From c2639125b97f3f7d9485830f7d5163cfb3129d68 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 14 Jul 2025 09:18:28 +0200 Subject: [PATCH] apache-orc: Fix cross-compilation --- pkgs/by-name/ap/apache-orc/package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index b84a8d71e6a4..d48b2dfaee33 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -44,12 +44,20 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - (lib.cmakeBool "BUILD_JAVA" false) - (lib.cmakeBool "STOP_BUILD_ON_WARNING" true) - (lib.cmakeBool "INSTALL_VENDORED_LIBS" false) - ]; + cmakeFlags = + [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + (lib.cmakeBool "BUILD_JAVA" false) + (lib.cmakeBool "STOP_BUILD_ON_WARNING" true) + (lib.cmakeBool "INSTALL_VENDORED_LIBS" false) + ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Fix (RiscV) cross-compilation + # See https://github.com/apache/orc/issues/2334 + (lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0") + (lib.cmakeFeature "HAS_POST_2038_EXITCODE" "0") + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-unused-parameter") + ]; env = { GTEST_HOME = gtest.dev;