Unverified Commit 1e3a05d8 authored by Kerstin's avatar Kerstin Committed by GitHub
Browse files

Merge pull request #287830 from trofi/osrm-backend-gcc-13-fix 

osrm-backend: fix `gcc-13` build
parents 9c112d37 52eea7de

pkgs/servers/osrm-backend/default.nix

+14 −2
Original line number Diff line number Diff line 
{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";

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -26691,7 +26691,7 @@ with pkgs; 














  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 { };