From 075e33a682621b1655fef9217a18a6f1e2234230 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 24 Aug 2016 21:27:51 +0200
Subject: plotutils: disable failing test on i686

Cherry-picked from staging to facilitate merging.

See f29214caed21438df6b4d961856ca3fcc4ec6e1b vs.
fd6a4d23c993f22dff434233ec50db98c6eaf8ed.
---
 pkgs/tools/graphics/plotutils/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix
index 1bbc76192b61..3cf0c5c3c89a 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/pkgs/tools/graphics/plotutils/default.nix
@@ -13,15 +13,19 @@ stdenv.mkDerivation rec {
     sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg";
   };
 
-  buildInputs = [libpng];
+  buildInputs = [ libpng ];
+
+  # disable failing test on i686
+  # https://lists.gnu.org/archive/html/bug-plotutils/2016-04/msg00002.html
+  prePatch = stdenv.lib.optionalString stdenv.isi686 ''
+    substituteInPlace test/Makefile.in --replace 'spline.test' ' '
+  '';
 
   patches = map fetchurl (import ./debian-patches.nix);
 
   configureFlags = "--enable-libplotter"; # required for pstoedit
 
-  # disable tests on i686 like ubuntu
-  # https://lists.gnu.org/archive/html/bug-plotutils/2016-04/msg00002.html
-  doCheck = if stdenv.isi686 then false else true;
+  doCheck = true;
 
   meta = {
     description = "Powerful C/C++ library for exporting 2D vector graphics";
@@ -45,9 +49,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/plotutils/;
 
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [
-      stdenv.lib.maintainers.marcweber
-    ];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }
-- 
cgit 1.4.1