tjh.dev
osmscout-server: add patches to support valhalla 3.4.0
authored by Tom Hall and committed by Robert Schütz a56eebfe 6208dded
+33
-4
pkgs/applications/misc/osmscout-server/default.nix
+33
-4
pkgs/applications/misc/osmscout-server/default.nix
···
1
-
{ lib, mkDerivation, fetchFromGitHub, pkg-config
2
-
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
3
-
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
4
-
, libmicrohttpd, sqlite, marisa, kyotocabinet, boost
5
}:
6
7
let
···
29
kirigami2 qtquickcontrols2 qtlocation
30
valhalla libosmscout osrm-backend libmicrohttpd
31
libpostal sqlite marisa kyotocabinet boost protobuf date
32
];
33
34
qmakeFlags = [
···
1
+
{ lib
2
+
, mkDerivation
3
+
, fetchFromGitHub
4
+
, fetchpatch
5
+
, pkg-config
6
+
, qmake
7
+
, qttools
8
+
, boost
9
+
, kirigami2
10
+
, kyotocabinet
11
+
, libmicrohttpd
12
+
, libosmscout
13
+
, libpostal
14
+
, marisa
15
+
, osrm-backend
16
+
, protobuf
17
+
, qtquickcontrols2
18
+
, qtlocation
19
+
, sqlite
20
+
, valhalla
21
}:
22
23
let
···
45
kirigami2 qtquickcontrols2 qtlocation
46
valhalla libosmscout osrm-backend libmicrohttpd
47
libpostal sqlite marisa kyotocabinet boost protobuf date
48
+
];
49
+
50
+
patches = [
51
+
# Valhalla 3.2.1 support. Only required for next patch to apply cleanly
52
+
(fetchpatch {
53
+
url = "https://github.com/rinigus/osmscout-server/commit/1df9d383e61dd14cbe9e5b52412a2e951cee2ee4.patch";
54
+
hash = "sha256-h+YTyHr4RYgwH5bfVgyujSekbL2LfV8vJgVkjXT0I10=";
55
+
})
56
+
# Valhalla 3.4.0 support
57
+
(fetchpatch {
58
+
url = "https://github.com/rinigus/osmscout-server/commit/fe6562a4c3ba5da2735232ea8fdc7f71d7e7e714.patch";
59
+
hash = "sha256-wibLTFk3cFS5mcC71TgMA9ZAAHS3mbjboFHqax6nCxs=";
60
+
})
61
];
62
63
qmakeFlags = [