From 5c7ce21c5a592e3704af5d56fb0f5dffba928a78 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 21 May 2019 15:26:11 +0000
Subject: [PATCH 1/2] indent: 2.2.10 -> 2.2.12

---
 pkgs/development/tools/misc/indent/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix
index 996043c16d8..d7bc90e3c26 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/pkgs/development/tools/misc/indent/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "indent-2.2.10";
+  name = "indent-2.2.12";
 
   src = fetchurl {
     url = "mirror://gnu/indent/${name}.tar.gz";
-    sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
+    sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7";
   };
 
+  buildInputs = [ texinfo ];
+
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's|#include <malloc.h>|#include <malloc/malloc.h>|' ./man/texinfo2man.c
   '';
@@ -15,9 +17,10 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = https://www.gnu.org/software/indent/;
+    homepage = "https://www.gnu.org/software/indent/";
     description = "A source code reformatter";
     license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.mmahut ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From 77908680f27882f7312c5b2c3dd34264e437eb49 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 21 May 2019 23:27:10 +0200
Subject: [PATCH 2/2] indent: fix darwin build

---
 pkgs/development/tools/misc/indent/darwin.patch | 15 +++++++++++++++
 pkgs/development/tools/misc/indent/default.nix  |  7 ++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/misc/indent/darwin.patch

diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/pkgs/development/tools/misc/indent/darwin.patch
new file mode 100644
index 00000000000..5458a0d93bf
--- /dev/null
+++ b/pkgs/development/tools/misc/indent/darwin.patch
@@ -0,0 +1,15 @@
+diff --git a/config.h.in b/config.h.in
+index 07e6fce..0c57e2a 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -432,8 +432,8 @@
+ # endif
+ # define _GL_EXTERN_INLINE extern
+ #else
+-# define _GL_INLINE static _GL_UNUSED
+-# define _GL_EXTERN_INLINE static _GL_UNUSED
++# define _GL_INLINE static
++# define _GL_EXTERN_INLINE static
+ #endif
+ 
+ #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix
index d7bc90e3c26..c4b5fecca74 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/pkgs/development/tools/misc/indent/default.nix
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7";
   };
 
+  patches = [ ./darwin.patch ];
+
   buildInputs = [ texinfo ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's|#include <malloc.h>|#include <malloc/malloc.h>|' ./man/texinfo2man.c
-  '';
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+    "-Wno-implicit-function-declaration";
 
   hardeningDisable = [ "format" ];