diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/pkgs/development/tools/misc/indent/darwin.patch deleted file mode 100644 index 5458a0d93bff..000000000000 --- a/pkgs/development/tools/misc/indent/darwin.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 44572609e402..a8ae4357a4c6 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -1,19 +1,27 @@ -{ lib, stdenv, fetchurl, texinfo, buildPackages, pkgsStatic }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, libintl +, texinfo +, buildPackages +, pkgsStatic +}: stdenv.mkDerivation rec { pname = "indent"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; + hash = "sha256-nmRjT8TOZ5eyBLy4iXzhT90KtIyldpb3h2fFnK5XgJU="; }; - patches = [ ./darwin.patch ]; makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; strictDeps = true; nativeBuildInputs = [ texinfo ]; + buildInputs = [ libintl ]; pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling env.NIX_CFLAGS_COMPILE = toString (