Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020

Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
parent 940c35568b c6ff360cc4
commit e520d6af29
36 changed files with 187 additions and 83 deletions
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -18,7 +18,9 @@ stdenv.mkDerivation (rec {
  nativeBuildInputs = [ cmake ];
  enableParallelBuilding = true;

-  doCheck = true;
+  cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ];
+
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
  checkTarget = "test";

  meta = {