From 227cfc24fef11b4ad179c0cadcd9d9da5f785f2d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 9 May 2021 01:41:11 +0200 Subject: [PATCH] haskellPackages.HTF: attempt to fix test suite on darwin A script used at test time in HTF assumes that you have GNU coreutils installed in a manner where all executables are prefixed with a `g`. Since we use GNU coreutils in the stdenv anyways, this is not necessary and needs to be patched out. --- pkgs/development/haskell-modules/configuration-darwin.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 6768bc5d6b4f..4f7a6a131d7e 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -161,4 +161,11 @@ self: super: { ] ++ (drv.librarySystemDepends or []); }); + HTF = overrideCabal super.HTF (drv: { + # GNU find is not prefixed in stdenv + postPatch = '' + substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find" + '' + (drv.postPatch or ""); + }); + }