0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

osm-gps-map: fix library propagation (#402648)

This commit is contained in:
Aleksana 2025-05-03 18:53:56 +08:00 committed by GitHub
commit 4f0aff31ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 8 deletions

View file

@ -0,0 +1,13 @@
diff --git a/osmgpsmap-1.0.pc.in b/osmgpsmap-1.0.pc.in
index 86efb3c..da6d1a9 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
+Requires.private: libsoup-2.4
Libs: -L${libdir} -losmgpsmap-1.0
Cflags: -I${includedir}/osmgpsmap-1.0

View file

@ -11,15 +11,22 @@
stdenv,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "osm-gps-map";
version = "1.2.0";
src = fetchzip {
url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz";
url = "https://github.com/nzjrs/osm-gps-map/releases/download/${finalAttrs.version}/osm-gps-map-${finalAttrs.version}.tar.gz";
sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0=";
};
patches = [
# libsoup is only used internally
# it should only be listed as private requirement
# https://github.com/nzjrs/osm-gps-map/pull/108
./dont-require-libsoup.patch
];
outputs = [
"out"
"dev"
@ -35,15 +42,18 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo
glib
gtk3
libsoup_2_4
];
meta = with lib; {
propagatedBuildInputs = [
gtk3
];
meta = {
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 ++ platforms.darwin;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ hrdinka ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
})