gpscorrelate: 1.6.1 -> unstable-2019-06-05

GPSCorrelate was originally written by Daniel Foote.
The maintainer is now Dan Fandrich and we now fetch
from their repo.

This default builds the newly ported gtk3 application
and should build with exiv2 0.27.1.

pkgs/applications/misc/gpscorrelate/default.nix

@@ -1,28 +1,41 @@
-{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2
+{ fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3
-, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
+, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
-  name = "gpscorrelate-${version}";
+  pname = "gpscorrelate";
-  version = "1.6.1";
+  version = "unstable-2019-06-05";
 
   src = fetchFromGitHub {
-    owner = "freefoote";
+    owner = "dfandrich";
-    repo = "gpscorrelate";
+    repo = pname;
-    rev = version;
+    rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85";
-    sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj";
+    sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
-  buildInputs = [
+    desktop-file-utils
-    exiv2 libxml2 gtk2
-    libxslt docbook_xsl 
     docbook_xml_dtd_42
+    docbook_xsl
+    libxslt
+    pkgconfig
   ];
 
-  patchPhase = ''
+  buildInputs = [
-    sed -i "Makefile" \
+    exiv2
-        -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g"
+    gtk3
-  '';
+    libxml2
+  ];
+
+  makeFlags = [
+    "prefix=${placeholder ''out''}"
+    "GTK=3"
+    "CC=cc"
+    "CXX=c++"
+  ];
+
+  doCheck = true;
+
+  installTargets = [ "install" "install-desktop-file" ];
 
   meta = with stdenv.lib; {
     description = "A GPS photo correlation tool, to add EXIF geotags";
@@ -44,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = licenses.gpl2Plus;
-    homepage = https://github.com/freefoote/gpscorrelate;
+    homepage = "https://github.com/dfandrich/gpscorrelate";
     platforms = platforms.linux;
   };
 }