about summary refs log tree commit diff
path: root/pkgs/tools/graphics/cuneiform
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2017-11-09 06:01:37 +0100
committeraszlig <aszlig@nix.build>2017-11-09 06:06:32 +0100
commit63a47699f7a5358c0c4dac045d04ca0ae5a92424 (patch)
tree108ea5b8348f62ea7815e9a132f9428aefe14215 /pkgs/tools/graphics/cuneiform
parente824c931b0cce98048f46c7ab0930cd2496c6bdc (diff)
cuneiform: Fix build against glibc 2.26
Since glibc 2.26 the string.h file includes <strings.h>, 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 <aszlig@nix.build>
Cc: @7c6f434c
Diffstat (limited to 'pkgs/tools/graphics/cuneiform')
-rw-r--r--pkgs/tools/graphics/cuneiform/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 7e639940d07e7..0a48e947a48ea 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 ];