From daa511e42296a7d5857e4d1718880d1f25a22522 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Jan 2021 07:52:00 +0000 Subject: gpsbabel: 1.6.0 -> 1.7.0 Fixes build (check phase) with gcc10. --- pkgs/applications/misc/gpsbabel/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/misc/gpsbabel/default.nix') diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 70862bb61e7..6b8cb66c78b 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -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 { pname = "gpsbabel"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gpsbabel"; repo = "gpsbabel"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0q17jhmaf7z5lld2ff7h6jb3v1yz8hbwd2rmaq2dsamc53dls8iw"; + sha256 = "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy"; }; 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 ]; + 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: [ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ] -- cgit 1.4.1