nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

Merge pull request #251331 from Thra11/valhalla-3-4-0-aarch64

valhalla: fix build with gcc 12

authored by

Weijia Wang and committed by
GitHub
08418afb 41948203

+26 -1
+14
pkgs/development/libraries/valhalla/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , pkg-config 6 7 , boost ··· 30 29 fetchSubmodules = true; 31 30 }; 32 31 32 + patches = [ 33 + # Fix build 34 + (fetchpatch { 35 + url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch"; 36 + hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U="; 37 + }) 38 + ]; 39 + 33 40 postPatch = '' 34 41 substituteInPlace src/bindings/python/CMakeLists.txt \ 35 42 --replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}" ··· 51 42 cmakeFlags = [ 52 43 "-DENABLE_TESTS=OFF" 53 44 "-DENABLE_BENCHMARKS=OFF" 45 + ]; 46 + 47 + env.NIX_CFLAGS_COMPILE = toString [ 48 + # Needed for date submodule with GCC 12 https://github.com/HowardHinnant/date/issues/750 49 + "-Wno-error=stringop-overflow" 54 50 ]; 55 51 56 52 buildInputs = [
+12 -1
pkgs/top-level/all-packages.nix
··· 25562 25562 25563 25563 valhalla = callPackage ../development/libraries/valhalla { 25564 25564 boost = boost.override { enablePython = true; python = python38; }; 25565 + protobuf = protobuf3_21.override { 25566 + abseil-cpp = abseil-cpp_202103.override { 25567 + cxxStandard = "17"; 25568 + }; 25569 + }; 25565 25570 }; 25566 25571 25567 25572 vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; ··· 34749 34744 34750 34745 osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { }; 34751 34746 34752 - osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; 34747 + osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { 34748 + protobuf = protobuf3_21.override { 34749 + abseil-cpp = abseil-cpp_202103.override { 34750 + cxxStandard = "17"; 34751 + }; 34752 + }; 34753 + }; 34753 34754 34754 34755 palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { }; 34755 34756