swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

gpsbabel: fix build for i686

Browse source
This commit is contained in:
Robert Helgesson 2015-11-28 11:25:35 +01:00
parent 920930510e
commit dcdd29cfcd
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";