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

authored by Artturi and committed by GitHub 57a7c5de 94186e43

+6 -4
+6 -4
pkgs/applications/misc/osmscout-server/default.nix
··· 1 1 { lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config 2 2 , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation 3 - , libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf 3 + , libosmscout, valhalla, libpostal, osrm-backend, protobuf 4 4 , libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost 5 5 }: 6 6 ··· 41 41 nativeBuildInputs = [ qmake pkg-config qttools ]; 42 42 buildInputs = [ 43 43 kirigami2 qtquickcontrols2 qtlocation 44 - mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 44 + valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 45 45 libpostal sqlite marisa kyotocabinet boost protobuf date 46 46 ]; 47 47 ··· 52 52 mv data/valhalla.json-3.1 data/valhalla.json 53 53 ''; 54 54 55 - # Choose to build the kirigami UI variant 56 - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ]; 55 + qmakeFlags = [ 56 + "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant 57 + "CONFIG+=disable_mapnik" # Disable the optional mapnik backend 58 + ]; 57 59 58 60 meta = with lib; { 59 61 description = "Maps server providing tiles, geocoder, and router";