diff options
| author | Kerstin <kerstin@erictapen.name> | 2024-02-10 22:17:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 22:17:34 +0100 |
| commit | 1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd (patch) | |
| tree | e9849953ab672d203d1445e5770bc014c4a9697d /pkgs/servers | |
| parent | 9c112d37cd69c4908fb5e7fb19edadd836e59464 (diff) | |
| parent | 52eea7def29f0fbac97a3bb96b0b96b46ea180db (diff) | |
| download | nixlib-1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd.tar nixlib-1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd.tar.gz nixlib-1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd.tar.bz2 nixlib-1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd.tar.lz nixlib-1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd.tar.xz nixlib-1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd.tar.zst nixlib-1e3a05d84674afac6e21f5c7ad7f1ac8bc507efd.zip | |
Merge pull request #287830 from trofi/osrm-backend-gcc-13-fix
osrm-backend: fix `gcc-13` build
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"; |