From 61ec8c1fe6edad1e99187b3f9ce74d14dc2078b7 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 7 Jun 2016 20:05:09 +0200
Subject: [PATCH 1/2] osm-gps-map: init at 1.1.0

---
 .../libraries/osm-gps-map/default.nix         | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/osm-gps-map/default.nix

diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
new file mode 100644
index 00000000000..7dc8b8c6112
--- /dev/null
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -0,0 +1,29 @@
+{ cairo, fetchzip, glib, gnome3, gobjectIntrospection, pkgconfig, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "osm-gps-map-${version}";
+  version = "1.1.0";
+
+  src = fetchzip {
+    url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz";
+    sha256 = "0fal3mqcf3yypir4f7njz0dm5wr7lqwpimjx28wz9imh48cqx9n9";
+  };
+
+  outputs = [ "dev" "out" "doc" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [
+    cairo glib gobjectIntrospection
+  ] ++ (with gnome3; [
+    gnome_common gtk libsoup
+  ]);
+
+  meta = with stdenv.lib; {
+    description = "Gtk+ widget for displaying OpenStreetMap tiles";
+    homepage = https://nzjrs.github.io/osm-gps-map;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ hrdinka ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec0e5547ce2..56c8138589e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8682,6 +8682,8 @@ in
 
   ortp = callPackage ../development/libraries/ortp { };
 
+  osm-gps-map = callPackage ../development/libraries/osm-gps-map { };
+
   p11_kit = callPackage ../development/libraries/p11-kit { };
 
   paperkey = callPackage ../tools/security/paperkey { };

From dadd9a71507d1425c18c4209b7a8c09a5c34010c Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 7 Jun 2016 20:07:16 +0200
Subject: [PATCH 2/2] darktable: add map feature

We lost darktables map (geo coordinates) feature in one of its pervious
updates. This readds it.
---
 pkgs/applications/graphics/darktable/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 52a123a7fb9..609d88cea3a 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -3,7 +3,7 @@
 , libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2
 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
 , libpng, libpthreadstubs, librsvg, libtiff, libxcb
-, openexr, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg
+, openexr, osm-gps-map, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg
 , mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon
 , epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3
 }:
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
       libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml
       colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core
       libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme
+      osm-gps-map
     ];
 
   cmakeFlags = [