diff options
| author | Robert Helgesson <robert@rycee.net> | 2017-07-23 12:47:30 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2017-07-23 13:51:28 +0200 |
| commit | 9e90d9e5a30238aedd92f3fcdc54658687cd9879 (patch) | |
| tree | 6a10ddd7a6cb87b9769440b43201cdef7f3394b8 /pkgs/applications/misc/gpsbabel/default.nix | |
| parent | 239b694579ca8a9a64e86609d4e9f49d0b01be2b (diff) | |
| download | nixpkgs-9e90d9e5a30238aedd92f3fcdc54658687cd9879.tar nixpkgs-9e90d9e5a30238aedd92f3fcdc54658687cd9879.tar.gz nixpkgs-9e90d9e5a30238aedd92f3fcdc54658687cd9879.tar.bz2 nixpkgs-9e90d9e5a30238aedd92f3fcdc54658687cd9879.tar.lz nixpkgs-9e90d9e5a30238aedd92f3fcdc54658687cd9879.tar.xz nixpkgs-9e90d9e5a30238aedd92f3fcdc54658687cd9879.tar.zst nixpkgs-9e90d9e5a30238aedd92f3fcdc54658687cd9879.zip | |
gpsbabel: 1.5.3 -> 1.5.4
Also really use QT5 and switch download location to GitHub.
Diffstat (limited to 'pkgs/applications/misc/gpsbabel/default.nix')
| -rw-r--r-- | pkgs/applications/misc/gpsbabel/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index ace89cd8a21..90ae1a87654 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; - version = "1.5.3"; + version = "1.5.4"; - src = fetchurl { - # gpgbabel.org makes it hard to get the source tarball automatically, so - # get it from elsewhere. - url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; - sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1"; + src = fetchFromGitHub { + owner = "gpsbabel"; + repo = "gpsbabel"; + rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi"; }; patches = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qt4 which ] + buildInputs = [ zlib qtbase which ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: |