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

osrm-backend: patch to hardcode path to default lua profiles once installed into $out

Browse source
This commit is contained in:
Robert Scott 2015-03-07 11:31:50 +00:00
parent 211f1b826f
commit c8da20fa5e
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch Normal file
View file

@ -0,0 +1,13 @@
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)

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib}: {stdenv, fetchurl, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "osrm-backend-4.5.0"; name = "osrm-backend-4.5.0";
@ -8,10 +8,17 @@ stdenv.mkDerivation rec {
sha256 = "af61e883051f2ecb73520ace6f17cc6da30edc413208ff7cf3d87992eca0756c"; sha256 = "af61e883051f2ecb73520ace6f17cc6da30edc413208ff7cf3d87992eca0756c";
}; };
patches = [ ./4.5.0-openmp.patch ]; patches = [
./4.5.0-openmp.patch
(substituteAll {
src = ./4.5.0-default-profile-path.template.patch;
})
];
buildInputs = [ cmake luabind luabind.lua libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ]; buildInputs = [ cmake luabind luabind.lua libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ];
postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
meta = { meta = {
homepage = https://github.com/Project-OSRM/osrm-backend/wiki; 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."; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project.";