From e7fb26513b8489efe94afd63f330dcb1568c1b77 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Fri, 25 Aug 2023 22:13:59 +0100 Subject: [PATCH] valhalla, osmscout-server: fix build To avoid linker errors, they need an older version of protobuf, both with abseil-cpp built using the same C++17 standard as valhalla and osmscout-server. --- pkgs/top-level/all-packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e00fbc33de82..f1928ea269f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25474,6 +25474,11 @@ with pkgs; valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python38; }; + protobuf = protobuf3_21.override { + abseil-cpp = abseil-cpp_202103.override { + cxxStandard = "17"; + }; + }; }; vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; @@ -34633,7 +34638,13 @@ with pkgs; osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { }; - osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; + osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { + protobuf = protobuf3_21.override { + abseil-cpp = abseil-cpp_202103.override { + cxxStandard = "17"; + }; + }; + }; palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };