Unverified Commit 0cd4c27f authored by Pierre-Etienne Meunier's avatar Pierre-Etienne Meunier Committed by GitHub
Browse files

Fixing JOE, the fully functional text editor, on macOS (#346118)

joe: fix build on darwin

Adding guards for apple
parent 402fdd44
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
diff -Naru i/joe/tty.c w/joe/tty.c
--- ./joe/tty.c	2018-01-10 17:28:34
+++ ../joe-i-4.6/joe/tty.c	2024-10-02 14:08:22
@@ -6,6 +6,9 @@
  *	This file is part of JOE (Joe's Own Editor)
  */
 #include "types.h"
+#if defined(__APPLE__) && defined(__MACH__)
+#include <util.h>
+#endif
 
 /* Needed for TIOCGWINSZ detection below */
 #ifdef GWINSZ_IN_SYS_IOCTL
+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
    sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9";
  };

  patches = [ ./macos-fix.patch ];

  meta = with lib; {
    description = "Full featured terminal-based screen editor";
    longDescription = ''