colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11322 from rycee/fix/gpsbabel-i686

Browse Source 
gpsbabel: fix build for i686
This commit is contained in:
Aristid Breitkreuz 2015-11-29 10:52:02 +01:00
commit 75abd4f0f9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/gpsbabel/default.nix
View File

@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
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";
++ stdenv.lib.optionals stdenv.isi686 [
"CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store"
];
enableParallelBuilding = true;
@ -32,7 +34,11 @@ stdenv.mkDerivation rec {
patchShebangs testo
substituteInPlace testo \
--replace "-x /usr/bin/hexdump" ""
'';
'' + (
# The raymarine and gtm tests fail on i686 despite -ffloat-store.
if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;"
else ""
);
meta = with stdenv.lib; {
description = "Convert, upload and download data from GPS and Map programs";