colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #289116 from raphaelr/fix/libosmscout

Browse Source 
libosmscout: Fix build with libxml 2.12
This commit is contained in:
Nick Cao 2024-02-16 09:58:54 -05:00 committed by GitHub
commit 95e62dfd60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libosmscout/default.nix
View File

@ -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 ];