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

gpsbabel: 1.5.3 -> 1.5.4

Browse Source 
Also really use QT5 and switch download location to GitHub.
This commit is contained in:
Robert Helgesson 2017-07-23 12:47:30 +02:00
parent 239b694579
commit 9e90d9e5a3
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }: { lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpsbabel-${version}"; name = "gpsbabel-${version}";
version = "1.5.3"; version = "1.5.4";
src = fetchurl { src = fetchFromGitHub {
# gpgbabel.org makes it hard to get the source tarball automatically, so owner = "gpsbabel";
# get it from elsewhere. repo = "gpsbabel";
url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1"; sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi";
}; };
patches = [ patches = [
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = [ zlib qt4 which ] buildInputs = [ zlib qtbase which ]
++ lib.optionals stdenv.isDarwin [ IOKit ]; ++ lib.optionals stdenv.isDarwin [ IOKit ];
/* FIXME: Building the documentation, with "make doc", requires this: /* FIXME: Building the documentation, with "make doc", requires this:

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

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