diff --git a/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch b/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch index 425fa95e508bc..40d892ba13831 100644 --- a/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch +++ b/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch @@ -1,13 +1,13 @@ diff --git a/osmgpsmap-1.0.pc.in b/osmgpsmap-1.0.pc.in -index 86efb3c..da6d1a9 100644 +index 1ca5883..30edb6d 100644 --- a/osmgpsmap-1.0.pc.in +++ b/osmgpsmap-1.0.pc.in @@ -6,6 +6,7 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ Description: Moving map widget using openstreet map data Version: @PACKAGE_VERSION@ --Requires: gtk+-3.0 libsoup-2.4 +-Requires: gtk+-3.0 libsoup-3.0 +Requires: gtk+-3.0 -+Requires.private: libsoup-2.4 ++Requires.private: libsoup-3.0 Libs: -L${libdir} -losmgpsmap-1.0 Cflags: -I${includedir}/osmgpsmap-1.0 diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 5f480db6582e5..841ae96506a68 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -1,23 +1,29 @@ { cairo, - fetchzip, + fetchFromGitHub, glib, - libsoup_2_4, + libsoup_3, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv, + autoconf, + automake, + gtk-doc, + libtool, }: stdenv.mkDerivation (finalAttrs: { pname = "osm-gps-map"; - version = "1.2.0"; + version = "unstable-2025-04-17"; - src = fetchzip { - url = "https://github.com/nzjrs/osm-gps-map/releases/download/${finalAttrs.version}/osm-gps-map-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0="; + src = fetchFromGitHub { + owner = "nzjrs"; + repo = "osm-gps-map"; + rev = "2396aa6cb2da877847049e7f4243a7d196f9862e"; + hash = "sha256-HAOzjPBoC/zpgIo09GYVlR98GNKqWkJ6117Ttqlr/bw="; }; patches = [ @@ -35,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config + autoconf + automake gobject-introspection gnome-common ]; @@ -42,9 +50,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo glib - libsoup_2_4 + libsoup_3 + gtk-doc + libtool ]; + preConfigure = "./autogen.sh"; + propagatedBuildInputs = [ gtk3 ]; @@ -53,7 +65,10 @@ stdenv.mkDerivation (finalAttrs: { description = "GTK widget for displaying OpenStreetMap tiles"; homepage = "https://nzjrs.github.io/osm-gps-map"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ hrdinka ]; + maintainers = with lib.maintainers; [ + hrdinka + cafkafk + ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; })