From cd2a423e3b13bc48b964ba3032e047dd3c29fbc2 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Date: Thu, 4 Apr 2024 18:32:16 +1300
Subject: [PATCH] Look for `do.` still

---
 builder/comp-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/comp-builder.nix b/builder/comp-builder.nix
index 39a70c06d5..0a8b191180 100644
--- a/builder/comp-builder.nix
+++ b/builder/comp-builder.nix
@@ -545,7 +545,7 @@ let
               # we assume that if the SETUP_HS command fails and the following line was found in the error
               # log, that it was the only error. Hence if we do _not_ find the line, grep will fail and this derivation
               # will be marked as failure.
-              cat $SETUP_ERR | grep 'No executables and no library found\. Nothing to'
+              cat $SETUP_ERR | tr '\n' ' ' | tr -d '\r' | grep 'No executables and no library found\. Nothing to do\.'
             fi
             ''}
       ${lib.optionalString (haskellLib.isLibrary componentId) ''