mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 21:21:06 +00:00
gpsbabel: fix build for i686
This commit is contained in:
parent
920930510e
commit
dcdd29cfcd
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue