ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

gpsbabel: fix darwin build

Browse Source
This commit is contained in:
Robert Helgesson 2017-03-06 23:29:48 +01:00
parent 1bb8a47803
commit 08656a73f0
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }: { lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpsbabel-${version}"; 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: /* FIXME: Building the documentation, with "make doc", requires this:
@ -40,11 +41,11 @@ stdenv.mkDerivation rec {
patchShebangs testo patchShebangs testo
substituteInPlace testo \ substituteInPlace testo \
--replace "-x /usr/bin/hexdump" "" --replace "-x /usr/bin/hexdump" ""
'' + ( ''
# The raymarine and gtm tests fail on i686 despite -ffloat-store. # 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;" + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
else "" # 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; { meta = with stdenv.lib; {
description = "Convert, upload and download data from GPS and Map programs"; description = "Convert, upload and download data from GPS and Map programs";

4
pkgs/top-level/all-packages.nix
View File

@ -13985,7 +13985,9 @@ with pkgs;
gosmore = callPackage ../applications/misc/gosmore { }; gosmore = callPackage ../applications/misc/gosmore { };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
};
gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { };