nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-03 02:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

valhalla: upstream fix for gcc-13 build

Browse Source 
Without the change `valhalla` build fails on `staging-next` as
https://hydra.nixos.org/build/245511803:

    /build/source/src/baldr/transitdeparture.cc: In constructor 'valhalla::baldr::TransitDeparture::TransitDeparture(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, bool, bool)':
    /build/source/src/baldr/transitdeparture.cc:24:16: error: 'runtime_error' is not a member of 'std'
       24 |     throw std::runtime_error("TransitDeparture: Exceeded maximum transit line Ids per tile");
          |                ^~~~~~~~~~~~~
    /build/source/src/baldr/transitdeparture.cc:3:1: note: 'std::runtime_error' is defined in header '<stdexcept>'; did you forget to '#include <stdexcept>'?
        2 | #include "midgard/logging.h"
      +++ |+#include <stdexcept>
This commit is contained in:
Sergei Trofimovich 2024-01-07 10:46:19 +00:00
parent 88f163d662
commit 396995f006
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/valhalla/default.nix
View File

@ -36,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch";
hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U=";
})
# Fix gcc-13 build:
# https://github.com/valhalla/valhalla/pull/4154
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/valhalla/valhalla/commit/ed93f30272377cc6803533a1bb94fe81d14af81c.patch";
hash = "sha256-w4pnOqk/Jj3unVuesE64QSecrUIVSqwK69t9xNVc4GA=";
})
];
postPatch = ''