diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/development/libraries/libosmscout | |
parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libosmscout')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libosmscout/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libosmscout/default.nix b/nixpkgs/pkgs/development/libraries/libosmscout/default.nix index 8452ccffe389..c33b8881a03a 100644 --- a/nixpkgs/pkgs/development/libraries/libosmscout/default.nix +++ b/nixpkgs/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 ]; |