Merge pull request #16051 from hrdinka/add/osm-gps-map

darktable: readd map/geotagging feature
This commit is contained in:
Franz Pletz 2016-07-19 13:03:16 +02:00 committed by GitHub
commit ddf59093ee
3 changed files with 33 additions and 1 deletions

View file

@ -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 = [

View file

@ -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;
};
}

View file

@ -8895,6 +8895,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 { };