BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

osrm-backend: fix gcc-13 build

Browse source 
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>;
         |                                  ^~~~~~~
This commit is contained in:
Sergei Trofimovich 2024-02-10 17:51:49 +00:00
parent 1ab54f84dc
commit 52eea7def2
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/servers/osrm-backend/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "osrm-backend"; pname = "osrm-backend";
@ -15,12 +15,24 @@ stdenv.mkDerivation rec {
buildInputs = [ bzip2 libxml2 libzip boost179 lua luabind tbb expat ]; 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 [ env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12 # Needed with GCC 12
"-Wno-error=stringop-overflow" "-Wno-error=stringop-overflow"
"-Wno-error=uninitialized" "-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"; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";

2
pkgs/top-level/all-packages.nix
View file

@ -26685,7 +26685,7 @@ with pkgs;
openxr-loader = callPackage ../development/libraries/openxr-loader { }; openxr-loader = callPackage ../development/libraries/openxr-loader { };
osrm-backend = disable-warnings-if-gcc13 (callPackage ../servers/osrm-backend { }); osrm-backend = callPackage ../servers/osrm-backend { };
oven-media-engine = callPackage ../servers/misc/oven-media-engine { }; oven-media-engine = callPackage ../servers/misc/oven-media-engine { };