diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 17:51:49 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 17:56:01 +0000 |
commit | 52eea7def29f0fbac97a3bb96b0b96b46ea180db (patch) | |
tree | 9d35e38fbd7e6e319ca19abb8b154a870756bcaa /pkgs/servers | |
parent | 1ab54f84dcd5ba80790ae7e9d593285d9b86b958 (diff) | |
download | nixlib-52eea7def29f0fbac97a3bb96b0b96b46ea180db.tar nixlib-52eea7def29f0fbac97a3bb96b0b96b46ea180db.tar.gz nixlib-52eea7def29f0fbac97a3bb96b0b96b46ea180db.tar.bz2 nixlib-52eea7def29f0fbac97a3bb96b0b96b46ea180db.tar.lz nixlib-52eea7def29f0fbac97a3bb96b0b96b46ea180db.tar.xz nixlib-52eea7def29f0fbac97a3bb96b0b96b46ea180db.tar.zst nixlib-52eea7def29f0fbac97a3bb96b0b96b46ea180db.zip |
osrm-backend: fix `gcc-13` build
Without the change build fails on `master` as https://hydra.nixos.org/build/247690774: /build/source/include/util/coordinate.hpp:66:34: error: 'int32_t' is not a member of 'std' 66 | using FixedLatitude = Alias<std::int32_t, tag::latitude>; | ^~~~~~~
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/osrm-backend/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 454cb7abc1c5..bf1d588ff1a6 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libxml2, libzip, boost179, lua, luabind, tbb, expat}: +{lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, bzip2, libxml2, libzip, boost179, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { pname = "osrm-backend"; @@ -15,12 +15,24 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 libxml2 libzip boost179 lua luabind tbb expat ]; - patches = [ ./darwin.patch ]; + patches = [ + # gcc-13 build fix: + # https://github.com/Project-OSRM/osrm-backend/pull/6632 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/Project-OSRM/osrm-backend/commit/af59a9cfaee4d601b5c88391624a05f2a38da17b.patch"; + hash = "sha256-dB9JP/DrJXpFGLD/paein2z64UtHIYZ17ycb91XWpEI="; + }) + + ./darwin.patch + ]; env.NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=stringop-overflow" "-Wno-error=uninitialized" + # Needed for GCC 13 + "-Wno-error=array-bounds" ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; |