summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/graphics/plotutils
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-08-24 21:27:51 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-08-24 22:12:49 +0200
commit075e33a682621b1655fef9217a18a6f1e2234230 (patch)
tree8fa0bc5bc1e891b06dca02b2321231cbc114f9f5 /pkgs/tools/graphics/plotutils
parent875e6c68de72bbd4e97876e63a7f6372e83aff50 (diff)
plotutils: disable failing test on i686
Cherry-picked from staging to facilitate merging. See f29214caed21438df6b4d961856ca3fcc4ec6e1b vs. fd6a4d23c993f22dff434233ec50db98c6eaf8ed.
Diffstat (limited to 'pkgs/tools/graphics/plotutils')
-rw-r--r--pkgs/tools/graphics/plotutils/default.nix16
1 files 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;
};
}