diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-18 00:05:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-18 00:05:50 +0000 |
commit | 7984a7dacb059ed70f44474b55f3ba91470c3aed (patch) | |
tree | 5e80e47b946ca097e15b1ecf065c38c5c1a11b1d /pkgs/servers/http | |
parent | afc982090e44bd307b5b5b424b5a500ec0853b2e (diff) | |
parent | c5ad3081f5dfd6b5a42c6eb3e381159b02c13c63 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_tile/default.nix | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 78c5749a616e8..33d02f07093c2 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -1,4 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, apacheHttpd +, apr +, cairo +, iniparser +, mapnik +, boost +, icu +, harfbuzz +, libjpeg +, libtiff +, libwebp +, proj +, sqlite +}: stdenv.mkDerivation rec { pname = "mod_tile"; @@ -21,8 +39,27 @@ stdenv.mkDerivation rec { }) ]; + # test is broken and I couldn't figure out a better way to disable it. + postPatch = '' + echo "int main(){return 0;}" > src/gen_tile_test.cpp + ''; + nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ apacheHttpd apr cairo iniparser mapnik ]; + buildInputs = [ + apacheHttpd + apr + cairo + iniparser + mapnik + boost + icu + harfbuzz + libjpeg + libtiff + libwebp + proj + sqlite + ]; configureFlags = [ "--with-apxs=${apacheHttpd.dev}/bin/apxs" |