about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJanik <80165193+Janik-Haag@users.noreply.github.com>2023-07-09 20:51:10 +0200
committerGitHub <noreply@github.com>2023-07-09 20:51:10 +0200
commitc3e258d51989cf1c055be128ef2279d3ceca6022 (patch)
treec3e12d8d40b0874474eff7f145a3fb6d53a0fa05 /pkgs
parent2b356dae6208d422236c4cdc48f3bed749f9daea (diff)
parenta7fc0b6e7016aa62c8a1e1f038d28d4b33f96e5c (diff)
Merge pull request #236171 from hummeltech/patch-1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/http/apache-modules/mod_tile/default.nix8
1 files 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 359dc17b390d3..f346008937ba8 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";