diff options
| author | Robert Helgesson <robert@rycee.net> | 2015-11-28 11:25:35 +0100 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2015-11-28 12:30:56 +0100 |
| commit | dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f (patch) | |
| tree | 82e7902a8de56203c082d45b268ca87a36627e6d /pkgs/applications/misc/gpsbabel | |
| parent | 920930510e7a8b626545890af5f41ac531814a57 (diff) | |
| download | nixpkgs-dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f.tar nixpkgs-dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f.tar.gz nixpkgs-dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f.tar.bz2 nixpkgs-dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f.tar.lz nixpkgs-dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f.tar.xz nixpkgs-dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f.tar.zst nixpkgs-dcdd29cfcd064e1df29ffbb57c4808b5c5faa94f.zip | |
gpsbabel: fix build for i686
Diffstat (limited to 'pkgs/applications/misc/gpsbabel')
| -rw-r--r-- | pkgs/applications/misc/gpsbabel/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 90de624c733..172f1347f6b 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -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"; |