From 98be6d2af86e039f36715bf1b1cd50d41a33476f Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:11:52 -0700 Subject: [PATCH] perlPackages.Tirex: Support for Mapnik v4.0.0 --- pkgs/development/perl-modules/Tirex/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix index 655610e898f2..48e63bb5932c 100644 --- a/pkgs/development/perl-modules/Tirex/default.nix +++ b/pkgs/development/perl-modules/Tirex/default.nix @@ -7,6 +7,7 @@ , JSON , LWP , mapnik +, boost , nix-update-script }: @@ -22,11 +23,18 @@ buildPerlPackage rec { }; 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/da0c5db926bc0939c53dd902a969b689ccf9edde.patch"; + url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch"; hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0="; }) + # Support Mapnik >= v4.0.0 (boost:filesystem no longer indirectly linked) + # https://github.com/openstreetmap/tirex/pull/59 + (fetchpatch { + url = "https://github.com/openstreetmap/tirex/commit/137903be9b7b35dde4c7010e65faa16bcf6ad476.patch"; + hash = "sha256-JDqwWVnzExPwLpzv4LbSmGYah956uko+Zdicahua9oQ="; + }) ]; buildInputs = [ @@ -35,6 +43,7 @@ buildPerlPackage rec { JSON LWP mapnik + boost ] ++ mapnik.buildInputs; installPhase = ''