From 862667648c3e85be6eb71b6de5f6b9fcd3e41862 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 8 Mar 2023 12:19:57 +0000 Subject: [PATCH] cross compilation: stop emulating re2 --- hosts/common/cross/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix index 6a5e37c3..6b764a61 100644 --- a/hosts/common/cross/default.nix +++ b/hosts/common/cross/default.nix @@ -1243,14 +1243,6 @@ in # fixes "error: could not find git for clone of catch2-populate" buildInputs = orig.buildInputs or [] ++ [ next.catch2_3 ]; }); - re2 = (prev.re2.override { - # fixes: "FAILED: CMakeFiles/test.util" - inherit (emulated) stdenv; - }).overrideAttrs (orig: { - # exhaustive{,1,2}_test times out after 1500s. - # this is after exhaustive3_test takes 600s to pass. - doCheck = false; - }); rmlint = prev.rmlint.override { # fixes "Checking whether the C compiler works... no" inherit (emulated) stdenv;