public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpsbabel: 1.6.0 -> 1.7.0

Browse Source 
Fixes build (check phase) with gcc10.
This commit is contained in:
Orivej Desh 2021-01-06 07:52:00 +00:00
parent b349d080d7
commit daa511e422
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }: { lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpsbabel"; pname = "gpsbabel";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gpsbabel"; owner = "gpsbabel";
repo = "gpsbabel"; repo = "gpsbabel";
rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "0q17jhmaf7z5lld2ff7h6jb3v1yz8hbwd2rmaq2dsamc53dls8iw"; sha256 = "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy";
}; };
patches = [ patches = [
@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = [ zlib qtbase which libusb-compat-0_1 ] buildInputs = [ libusb1 qtbase zlib ]
++ lib.optionals stdenv.isDarwin [ IOKit ]; ++ lib.optionals stdenv.isDarwin [ IOKit ];
checkInputs = [ which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase.
/* FIXME: Building the documentation, with "make doc", requires this: /* FIXME: Building the documentation, with "make doc", requires this:
[ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ] [ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ]