From 23e36778a13ca70c16535fbbd47590ec4205178d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 21 Jun 2021 04:20:00 +0000 Subject: [PATCH] entr: fix segfault on darwin --- pkgs/tools/misc/entr/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index dd5d960085b..abfd12523db 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, coreutils, ncurses }: +{ lib, stdenv, fetchurl, coreutils, ncurses, fetchpatch }: stdenv.mkDerivation rec { pname = "entr"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-4lak0vvkb2EyRggzukR+ZdfzW6nQsmXnxBUDl8xEBaI="; }; + patches = lib.optionals stdenv.isDarwin [ + # Fix v4.9 segfault on Darwin. remove with the next update + # https://github.com/eradman/entr/issues/74 + (fetchpatch { + url = "https://github.com/eradman/entr/commit/468d77d45925abba826bb1dcda01487dbe37eb33.patch"; + sha256 = "17kkcrsnac0pb930sf2kix71h4c7krzsrvz8pskx0vm39n1c9xfi"; + includes = [ "entr.c" ]; + }) + ]; + postPatch = '' substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat