movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #145756 from Thra11/osmscout-server-drop-mapnik

Browse source
This commit is contained in:
Artturi 2021-11-18 17:03:44 +02:00 • committed by GitHub
commit 57a7c5de18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/misc/osmscout-server/default.nix
View file

@ -1,6 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config { lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
, libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf , libosmscout, valhalla, libpostal, osrm-backend, protobuf
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost , libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
}: }:
@ -41,7 +41,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake pkg-config qttools ]; nativeBuildInputs = [ qmake pkg-config qttools ];
buildInputs = [ buildInputs = [
kirigami2 qtquickcontrols2 qtlocation kirigami2 qtquickcontrols2 qtlocation
mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
libpostal sqlite marisa kyotocabinet boost protobuf date libpostal sqlite marisa kyotocabinet boost protobuf date
]; ];
@ -52,8 +52,10 @@ mkDerivation rec {
mv data/valhalla.json-3.1 data/valhalla.json mv data/valhalla.json-3.1 data/valhalla.json
''; '';
# Choose to build the kirigami UI variant qmakeFlags = [
qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ]; "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant
"CONFIG+=disable_mapnik" # Disable the optional mapnik backend
];
meta = with lib; { meta = with lib; {
description = "Maps server providing tiles, geocoder, and router"; description = "Maps server providing tiles, geocoder, and router";