JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #127733 from marsam/fix-entr-darwin

Browse Source 
entr: fix segfault on darwin
This commit is contained in:
Mario Rodas 2021-06-22 02:44:16 -05:00 committed by GitHub
commit 52a56d3910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/misc/entr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, coreutils, ncurses }: { lib, stdenv, fetchurl, coreutils, ncurses, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "entr"; pname = "entr";
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-4lak0vvkb2EyRggzukR+ZdfzW6nQsmXnxBUDl8xEBaI="; 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 = '' postPatch = ''
substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace Makefile.bsd --replace /bin/echo echo
substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat