Unverified Commit 85422c0f authored by Shea Levy's avatar Shea Levy
Browse files

lsof: Fix build on darwin.

parent 9330ef4d

pkgs/development/tools/misc/lsof/darwin-dfile.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c

--- a/dialects/darwin/libproc/dfile.c	2018-02-14 09:28:06.000000000 -0500

+++ b/dialects/darwin/libproc/dfile.c	2018-04-16 18:52:40.828715293 -0400

@@ -43,7 +43,7 @@

 #include "lsof.h"

 

 #if	defined(PROC_FP_GUARDED)

-#extern	struct pff_tab	Pgf_tab[];

+extern	struct pff_tab	Pgf_tab[];

 #endif	/* defined(PROC_FP_GUARDED) */

pkgs/development/tools/misc/lsof/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -28,8 +28,12 @@ stdenv.mkDerivation rec { 


  unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";



  patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch;



  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

    substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1

  '' + stdenv.lib.optionalString stdenv.isDarwin ''

    sed -i 's|lcurses|lncurses|g' Configure

  '';



  # Stop build scripts from searching global include paths