diff options
author | Robert Helgesson <robert@rycee.net> | 2017-03-06 23:29:48 +0100 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2017-04-10 22:57:06 +0200 |
commit | 08656a73f06e27c2a73ccdfcaa434f8ee26da2fb (patch) | |
tree | d5cb5b9b2644ab4574734535d910ca85bcf1badc /pkgs/applications/misc/gpsbabel/default.nix | |
parent | 1bb8a47803ea5015de2fcc3f99fd2323e7de1d91 (diff) | |
download | nixpkgs-08656a73f06e27c2a73ccdfcaa434f8ee26da2fb.tar nixpkgs-08656a73f06e27c2a73ccdfcaa434f8ee26da2fb.tar.gz nixpkgs-08656a73f06e27c2a73ccdfcaa434f8ee26da2fb.tar.bz2 nixpkgs-08656a73f06e27c2a73ccdfcaa434f8ee26da2fb.tar.lz nixpkgs-08656a73f06e27c2a73ccdfcaa434f8ee26da2fb.tar.xz nixpkgs-08656a73f06e27c2a73ccdfcaa434f8ee26da2fb.tar.zst nixpkgs-08656a73f06e27c2a73ccdfcaa434f8ee26da2fb.zip |
gpsbabel: fix darwin build
Diffstat (limited to 'pkgs/applications/misc/gpsbabel/default.nix')
-rw-r--r-- | pkgs/applications/misc/gpsbabel/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 6c248bc4dfa..d017c704484 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }: +{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qt4 which ]; + buildInputs = [ zlib qt4 which ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -40,11 +41,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 "" - ); + + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" + # The tomtom asc test fails on darwin, see PR #23572. + + lib.optionalString stdenv.isDarwin "rm -v testo.d/tomtom_asc.test;"; meta = with stdenv.lib; { description = "Convert, upload and download data from GPS and Map programs"; |