From 729c55e7cca13544804184f45168cda3df24260d Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sun, 30 Mar 2025 19:32:05 +0200
Subject: [PATCH 1/2] mapnik: 4.0.5 -> 4.0.7

Fixes build for darwin (and all platforms using libc++ >= 19)
---
 pkgs/development/libraries/mapnik/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 5ac9522155f1..4769eb7ed11d 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mapnik";
-  version = "4.0.5";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
     rev = "v${version}";
-    hash = "sha256-pReoyMdu8RYrberKcwGw0DKmkxVRJezZYcPAM/UAn6o=";
+    hash = "sha256-gJktRWcJiSGxxjvWFt+Kl9d7g+TOSPk2PfGP0LIVxt4=";
     fetchSubmodules = true;
   };
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace configure \
-      --replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons
+      --replace-fail '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons
     rm -r scons
     # Remove bundled 'sparsehash' directory in favor of 'sparsehash' package
     rm -r deps/mapnik/sparsehash
@@ -134,15 +134,5 @@ stdenv.mkDerivation rec {
       ];
     license = licenses.lgpl21Plus;
     platforms = platforms.all;
-
-    # 29-03-2025: On darwin, the libc++ standard library is used to compile C++ programs.
-    # 29-03-2025: Since the base template for `std::char_traits` was removed in LLVM 19,
-    # 29-03-2025: usages of `boost::u32regex` will no longer compile.
-    # 29-03-2025: Linux builds do not fail as they use libstdc++, which has not removed
-    # 29-03-2025: such `std::char_trait` declarations.
-    #
-    # 29-03-2025: See https://github.com/mapnik/mapnik/issues/4499 for more information
-    # 29-03-2025: and a Minimal Reproducible Example.
-    badPlatforms = platforms.darwin;
   };
 }

From 6ec1bf6d88d0e693edd20ceb201558e4021fa04b Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Fri, 11 Apr 2025 10:51:18 +0200
Subject: [PATCH 2/2] python3Packages.python-mapnik: disable failing test

---
 pkgs/development/python-modules/python-mapnik/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index 2ce7bff0593d..133261a66593 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -114,6 +114,7 @@ buildPythonPackage rec {
       "test_pdf_printing"
       "test_render_with_scale_factor"
       "test_raster_warping"
+      "test_pycairo_svg_surface1"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       "test_passing_pycairo_context_png"
@@ -121,7 +122,6 @@ buildPythonPackage rec {
       "test_pycairo_pdf_surface1"
       "test_pycairo_pdf_surface2"
       "test_pycairo_pdf_surface3"
-      "test_pycairo_svg_surface1"
       "test_pycairo_svg_surface2"
       "test_pycairo_svg_surface3"
     ];