From 63a47699f7a5358c0c4dac045d04ca0ae5a92424 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 9 Nov 2017 06:01:37 +0100 Subject: [PATCH] cuneiform: Fix build against glibc 2.26 Since glibc 2.26 the string.h file includes , which in case of cuneiform will include the strings.h found in Kern/hhh/tigerh/h, because of the search path order. Fortunately for us the strings.h in cuneiform are completely unused and no files reference or include it. I even checked various references to types within strings.h and the only occurences are in cf_strings.h, which is also included by other files. Signed-off-by: aszlig Cc: @7c6f434c --- pkgs/tools/graphics/cuneiform/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 7e639940d07..0a48e947a48 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + rm cuneiform_src/Kern/hhh/tigerh/h/strings.h + ''; + buildInputs = [ imagemagick ]; nativeBuildInputs = [ cmake ];