Commit e7fb2651 authored by Tom Hall's avatar Tom Hall
Browse files

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.
parent 900db7c0

pkgs/top-level/all-packages.nix

+12 −1
Original line number Diff line number Diff line
@@ -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 { };