From 3c070741a9e39701961ec1bef5da725cad3da07a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 25 Jul 2023 01:24:00 +0400 Subject: [PATCH] osm2pgsql: fix build --- pkgs/tools/misc/osm2pgsql/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 12d0cf0bee1c5cd..1fa26d1f6d0cfc6 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , expat +, fetchpatch , fmt , proj , bzip2 @@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck="; }; + patches = [ + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch"; + hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4="; + }) + ]; + postPatch = '' # Remove bundled libraries rm -r contrib