From 4dbf8f6915596e54bb6610045ad484b594eb30fb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Jul 2022 23:01:55 +0200 Subject: [PATCH] libhwy: fix tests when cross-compiling It seems to need some help to find gtest when cross compiling. (Only applies when cross-compiling to compatible architectures where the tests are enabled, like pkgsStatic.) Co-authored-by: Daniel Olsen --- pkgs/development/libraries/libhwy/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix index 7656e063822d..43b2e93d8270 100644 --- a/pkgs/development/libraries/libhwy/default.nix +++ b/pkgs/development/libraries/libhwy/default.nix @@ -23,16 +23,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - checkInputs = [ gtest ]; - # Required for case-insensitive filesystems ("BUILD" exists) dontUseCmakeBuildDir = true; - cmakeFlags = [ + cmakeFlags = let + libExt = stdenv.hostPlatform.extensions.library; + in [ "-GNinja" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optional doCheck "-DHWY_SYSTEM_GTEST:BOOL=ON"; + ] ++ lib.optionals doCheck [ + "-DHWY_SYSTEM_GTEST:BOOL=ON" + "-DGTEST_INCLUDE_DIR=${lib.getDev gtest}/include" + "-DGTEST_LIBRARY=${lib.getLib gtest}/lib/libgtest${libExt}" + "-DGTEST_MAIN_LIBRARY=${lib.getLib gtest}/lib/libgtest_main${libExt}" + ]; # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 doCheck = !stdenv.hostPlatform.isDarwin;