From 89e22a78b7fbeb8b71b44e3ec090c6533510ecf6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 14 Nov 2015 23:59:20 +0100
Subject: [PATCH 1/2] gpsbabel: fix build on i686
---
pkgs/applications/misc/gpsbabel/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 0625219c2762..42c6854b4446 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
But FOP isn't packaged yet. */
preConfigure = "cd gpsbabel";
- configureFlags = [ "--with-zlib=system" ];
+ configureFlags = [ "--with-zlib=system" ]
+ # Floating point behavior on i686 causes test failures. Preventing
+ # extended precision fixes this problem.
+ ++ stdenv.lib.optional stdenv.isi686 "CXXFLAGS=-ffloat-store";
doCheck = true;
preCheck = ''
From efdc9a0bd809dfe502934d8e8f40f2355b165fc7 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 14 Nov 2015 23:59:42 +0100
Subject: [PATCH 2/2] gpsbabel: enable parallel building
---
pkgs/applications/misc/gpsbabel/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 42c6854b4446..90de624c733f 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
# extended precision fixes this problem.
++ stdenv.lib.optional stdenv.isi686 "CXXFLAGS=-ffloat-store";
+ enableParallelBuilding = true;
+
doCheck = true;
preCheck = ''
patchShebangs testo