From a7fc0b6e7016aa62c8a1e1f038d28d4b33f96e5c Mon Sep 17 00:00:00 2001 From: Hummeltech <6109326+hummeltech@users.noreply.github.com> Date: Mon, 5 Jun 2023 16:18:21 -0700 Subject: [PATCH] mod_tile: testing enabled It looks like the commit used to build `mapnik` was just missing some additional variable definitions in `libmapnik.pc` which are relied upon by the commit used to build `mod_tile` --- pkgs/servers/http/apache-modules/mod_tile/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 359dc17b390d..f346008937ba 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -50,16 +50,16 @@ stdenv.mkDerivation rec { ]; # the install script wants to install mod_tile.so into apache's modules dir + # also mapnik pkg-config config is missing this patch: https://github.com/mapnik/mapnik/commit/692c2faa0ef168a8c908d262c2bbfe51a74a8336.patch postPatch = '' sed -i "s|\''${HTTPD_MODULES_DIR}|$out/modules|" CMakeLists.txt + sed -i -e "s|@MAPNIK_FONTS_DIR@|$(mapnik-config --fonts)|" -e "s|@MAPNIK_PLUGINS_DIR@|$(mapnik-config --input-plugins)|" tests/renderd.conf.in ''; enableParallelBuilding = true; - # We need to either disable the `render_speedtest` and `download_tile` tests - # or fix the URLs they try to download from - #cmakeFlags = [ "-DENABLE_TESTS=1" ]; - #doCheck = true; + cmakeFlags = [ "-DENABLE_TESTS=1" ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/openstreetmap/mod_tile";