diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-06 16:19:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-06 16:19:25 +0200 |
commit | 08418afb397f08a3c5822baa9d74ea81209c5995 (patch) | |
tree | c112ced8a92d5839b41964eec3f35efb777b69bd | |
parent | 4194820330c13c8a62ffd7213b21075883e49448 (diff) | |
parent | e7fb26513b8489efe94afd63f330dcb1568c1b77 (diff) |
Merge pull request #251331 from Thra11/valhalla-3-4-0-aarch64
valhalla: fix build with gcc 12
-rw-r--r-- | pkgs/development/libraries/valhalla/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
2 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index 2d400d73f4015..bfd23747db0a2 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , boost @@ -29,6 +30,14 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix build + (fetchpatch { + url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch"; + hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U="; + }) + ]; + postPatch = '' substituteInPlace src/bindings/python/CMakeLists.txt \ --replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}" @@ -44,6 +53,11 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_BENCHMARKS=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed for date submodule with GCC 12 https://github.com/HowardHinnant/date/issues/750 + "-Wno-error=stringop-overflow" + ]; + buildInputs = [ boost curl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0442efdce85dd..d9b9b6cef1cec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25562,6 +25562,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 { }; @@ -34744,7 +34749,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 { }; |