Skip to content

Commit c2952ba

Browse files
committed
1 parent 24a0f05 commit c2952ba

File tree

3 files changed

+50
-42
lines changed

3 files changed

+50
-42
lines changed

pkgs/servers/osrm-backend/darwin.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,47 @@
1-
{lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, bzip2, libxml2, libzip, boost179, lua, luabind, tbb, expat}:
1+
{
2+
lib,
3+
stdenv,
4+
fetchFromGitHub,
5+
fetchpatch,
6+
cmake,
7+
pkg-config,
8+
bzip2,
9+
libxml2,
10+
libzip,
11+
boost,
12+
lua,
13+
luabind,
14+
tbb,
15+
expat,
16+
nixosTests,
17+
}:
218

319
stdenv.mkDerivation rec {
420
pname = "osrm-backend";
5-
version = "5.26.0";
21+
version = "5.27.1";
622

723
src = fetchFromGitHub {
8-
owner = "Project-OSRM";
9-
repo = "osrm-backend";
24+
owner = "Project-OSRM";
25+
repo = "osrm-backend";
1026
rev = "v${version}";
11-
sha256 = "sha256-kqRYE26aeq7nCen56TJo3BlyLFWn4NMltsq+re64/VQ=";
27+
sha256 = "sha256-3oA/U5O4GLfwMF7x99JQuFK7ewDrLJLh6BBLYfnyNaM=";
1228
};
1329

14-
nativeBuildInputs = [ cmake pkg-config ];
30+
nativeBuildInputs = [
31+
cmake
32+
pkg-config
33+
];
1534

16-
buildInputs = [ bzip2 libxml2 libzip boost179 lua luabind tbb expat ];
35+
buildInputs = [
36+
bzip2
37+
libxml2
38+
libzip
39+
boost
40+
lua
41+
luabind
42+
tbb
43+
expat
44+
];
1745

1846
patches = [
1947
# gcc-13 build fix:
@@ -23,8 +51,6 @@ stdenv.mkDerivation rec {
2351
url = "https://github.com/Project-OSRM/osrm-backend/commit/af59a9cfaee4d601b5c88391624a05f2a38da17b.patch";
2452
hash = "sha256-dB9JP/DrJXpFGLD/paein2z64UtHIYZ17ycb91XWpEI=";
2553
})
26-
27-
./darwin.patch
2854
];
2955

3056
env.NIX_CFLAGS_COMPILE = toString [
@@ -35,13 +61,21 @@ stdenv.mkDerivation rec {
3561
"-Wno-error=array-bounds"
3662
];
3763

38-
postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
64+
postInstall = ''
65+
mkdir -p $out/share/osrm-backend
66+
cp -r ../profiles $out/share/osrm-backend/profiles
67+
'';
68+
69+
passthru.tests = {
70+
inherit (nixosTests) osrm-backend;
71+
};
3972

4073
meta = {
4174
homepage = "https://github.com/Project-OSRM/osrm-backend/wiki";
4275
description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
76+
changelog = "https://github.com/Project-OSRM/osrm-backend/blob/master/CHANGELOG.md";
4377
license = lib.licenses.bsd2;
44-
maintainers = with lib.maintainers;[ erictapen ];
78+
maintainers = with lib.maintainers; [ erictapen ];
4579
platforms = lib.platforms.unix;
4680
};
4781
}

pkgs/top-level/all-packages.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25755,7 +25755,11 @@ with pkgs;
2575525755

2575625756
openxr-loader = callPackage ../development/libraries/openxr-loader { };
2575725757

25758-
osrm-backend = callPackage ../servers/osrm-backend { };
25758+
osrm-backend = callPackage ../servers/osrm-backend {
25759+
tbb = tbb_2021_11;
25760+
# https://github.com/Project-OSRM/osrm-backend/issues/6503
25761+
boost = boost179;
25762+
};
2575925763

2576025764
oven-media-engine = callPackage ../servers/misc/oven-media-engine { };
2576125765

0 commit comments

Comments
 (0)