Merge pull request #32260 from erictapen/osrm-bump

osrm-backend: 4.9.1 -> 5.14.1

3 files changed, 5 insertions, 39 deletions

diff --git a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch
deleted file mode 100644
index 12fcdb4fd02c..000000000000
--- a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp
-index d14d8d9..c64d7fd 100644
---- a/extractor/extractor_options.cpp
-+++ b/extractor/extractor_options.cpp
-@@ -50,7 +50,7 @@ bool ExtractorOptions::ParseArguments(int argc, char *argv[], ExtractorConfig &e
-     boost::program_options::options_description config_options("Configuration");
-     config_options.add_options()("profile,p",
-                                  boost::program_options::value<boost::filesystem::path>(
--                                     &extractor_config.profile_path)->default_value("profile.lua"),
-+                                     &extractor_config.profile_path)->default_value("@out@/profiles/car.lua"),
-                                  "Path to LUA routing profile")(
-         "threads,t",
-         boost::program_options::value<unsigned int>(&extractor_config.requested_num_threads)
diff --git a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
deleted file mode 100644
index 87b9b9501c4c..000000000000
--- a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
-     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
-         NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
-       message(STATUS "Using gcc specific binutils for LTO.")
--      set(CMAKE_AR     "/usr/bin/gcc-ar")
--      set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
-+      # Just let PATH do its job
-+      set(CMAKE_AR     "gcc-ar")
-+      set(CMAKE_RANLIB "gcc-ranlib")
-     endif()
-   endif (HAS_LTO_FLAG)
- endif()
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 8846f50c8861..7ade52b2ee79 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -1,24 +1,17 @@
-{stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
+{stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}:
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "4.9.1";
+  version = "5.14.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "1r4dwniwxgfppnb9asdh98w5qxqwkjhp9gc5fabmck0gk73cwkcc";
+    sha256 = "0n7fpm8m5r93dxciagp2n8ij1wg483yb9srbzdzjqf1zzyh637sz";
   };
 
-  patches = [
-    ./4.5.0-gcc-binutils.patch
-    (substituteAll {
-      src = ./4.5.0-default-profile-path.template.patch;
-    })
-  ];
-
-  buildInputs = [ cmake luabind libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ];
+  buildInputs = [ cmake pkgconfig bzip2 libxml2 libzip boost lua luabind tbb expat];
 
   postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
 
@@ -26,6 +19,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Project-OSRM/osrm-backend/wiki;
     description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
     license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers;[ erictapen ];
     platforms = stdenv.lib.platforms.linux;
   };
 }