From 4f9fee9b3ffe6fa0d531e59407b51a35be99797c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 5 Aug 2025 01:27:07 +0400 Subject: [PATCH] =?UTF-8?q?perlPackages.Tirex:=200.7.1=20=E2=86=92=200.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/perl-modules/Tirex/default.nix | 11 ++--------- .../perl-modules/Tirex/use-pkg-config.patch | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix index 86bb82759ba4..02ab159e928f 100644 --- a/pkgs/development/perl-modules/Tirex/default.nix +++ b/pkgs/development/perl-modules/Tirex/default.nix @@ -2,7 +2,6 @@ lib, buildPerlPackage, fetchFromGitHub, - fetchpatch, GD, IPCShareLite, JSON, @@ -15,22 +14,16 @@ buildPerlPackage rec { pname = "Tirex"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "tirex"; tag = "v${version}"; - hash = "sha256-p2P19tifA/AvJatTzboyhtt7W1SwKJQzqpU4oDalfhU="; + hash = "sha256-tFDyN3slj9ipa9JPB6f+mnzMIW926vOge4ZSbmxjtiE="; }; patches = [ - # Support Mapnik >= v4.0.0 (`mapnik/box2d.hpp` -> `mapnik/geometry/box2d.hpp`) - # https://github.com/openstreetmap/tirex/pull/54 - (fetchpatch { - url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch"; - hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0="; - }) # Support Mapnik >= v4.0.0 (no more mapnik-config) ./use-pkg-config.patch ]; diff --git a/pkgs/development/perl-modules/Tirex/use-pkg-config.patch b/pkgs/development/perl-modules/Tirex/use-pkg-config.patch index c9a98307f9cf..57e3ec6c4bd5 100644 --- a/pkgs/development/perl-modules/Tirex/use-pkg-config.patch +++ b/pkgs/development/perl-modules/Tirex/use-pkg-config.patch @@ -6,8 +6,8 @@ -CXXFLAGS = `mapnik-config --cflags` $(CFLAGS) +CXXFLAGS += `pkg-config --cflags libmapnik` -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast --LDFLAGS= `mapnik-config --libs --ldflags --dep-libs` +-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs` -lboost_filesystem +LDFLAGS += `pkg-config --libs libmapnik` -lboost_filesystem backend-mapnik: renderd.o metatilehandler.o networklistener.o networkmessage.o networkrequest.o networkresponse.o debuggable.o requesthandler.o - $(CXX) -o $@ $^ $(LDFLAGS) \ No newline at end of file + $(CXX) -o $@ $^ $(LDFLAGS)