about summary refs log tree commit diff
path: root/pkgs/development/libraries/libosmscout
diff options
context:
space:
mode:
authorRaphael Robatsch <raphael-git@tapesoftware.net>2024-02-15 19:20:38 +0100
committerRaphael Robatsch <raphael-git@tapesoftware.net>2024-02-15 19:20:38 +0100
commit30395948d25cf60c7bc49f6da2ecc752eb240a92 (patch)
tree7be2c7c627e56d1b191823a34a8b331ee6509c55 /pkgs/development/libraries/libosmscout
parent110b0eb2e534a2ab923738b7f5f4a25815e33a80 (diff)
libosmscout: Fix build with libxml 2.12
error: invalid conversion from 'void (*)(void*, xmlErrorPtr)'
{aka 'void (*)(void*, _xmlError*)'} to
xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'}
Diffstat (limited to 'pkgs/development/libraries/libosmscout')
-rw-r--r--pkgs/development/libraries/libosmscout/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix
index 8452ccffe389d..c33b8881a03af 100644
--- a/pkgs/development/libraries/libosmscout/default.nix
+++ b/pkgs/development/libraries/libosmscout/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config
 , marisa, qttools, qtlocation }:
 
 mkDerivation rec {
@@ -12,6 +12,16 @@ mkDerivation rec {
     sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g=";
   };
 
+  patches = [
+    # Fix build with libxml v2.12
+    # FIXME: Remove at next package update
+    (fetchpatch {
+      name = "libxml-2.12-fix.patch";
+      url = "https://github.com/Framstag/libosmscout/commit/db7b307de1a1146a6868015a0adfc2e21b7d5e39.patch";
+      hash = "sha256-5NDamzb2K18sMVfREnUNksgD2NL7ELzLl83SlGIveO0=";
+    })
+  ];
+
   cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ];
 
   nativeBuildInputs = [ cmake pkg-config ];