Merge pull request #24235 from ndowens/gpscorrelate

gpscorrelate: 1.6.0 -> 1.6.1
This commit is contained in:
ndowens 2017-03-23 20:00:49 -05:00 committed by GitHub
commit 82624cbb9a

View File

@ -1,17 +1,22 @@
{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2
{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2
, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
stdenv.mkDerivation rec {
name = "gpscorrelate-1.6.0";
name = "gpscorrelate-${version}";
version = "1.6.1";
src = fetchurl {
url = "http://freefoote.dview.net/linux/${name}.tar.gz";
sha256 = "1j0b244xkvvf0i4iivp4dw9k4xgyasx4sapd91mnwki35fy49sp0";
src = fetchFromGitHub {
owner = "freefoote";
repo = "gpscorrelate";
rev = version;
sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
pkgconfig exiv2 libxml2 gtk2
libxslt docbook_xsl docbook_xml_dtd_42
exiv2 libxml2 gtk2
libxslt docbook_xsl
docbook_xml_dtd_42
];
patchPhase = ''
@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
-es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g"
'';
meta = {
meta = with stdenv.lib; {
description = "A GPS photo correlation tool, to add EXIF geotags";
longDescription = ''
@ -38,9 +43,8 @@ stdenv.mkDerivation rec {
one takes the GPS data in a different format.
'';
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://freefoote.dview.net/linux_gpscorr.html;
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
homepage = https://github.com/freefoote/gpscorrelate;
platforms = platforms.linux;
};
}