From 097602fa2ea72abd600d2b3a22ea503ffc67246a Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sat, 13 Nov 2021 13:29:53 +0000 Subject: [PATCH] osmscout-server: Remove optional dependency mapnik Mapnik keeps breaking and is not the main backend used by osmscout-server. --- pkgs/applications/misc/osmscout-server/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index a3815dae00fc..d6041554705e 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config , 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 }: @@ -41,7 +41,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ 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 ]; @@ -52,8 +52,10 @@ mkDerivation rec { mv data/valhalla.json-3.1 data/valhalla.json ''; - # Choose to build the kirigami UI variant - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ]; + qmakeFlags = [ + "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant + "CONFIG+=disable_mapnik" # Disable the optional mapnik backend + ]; meta = with lib; { description = "Maps server providing tiles, geocoder, and router";