diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix index f346008937ba..85ff5a97e636 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -10,7 +10,6 @@ , cairo , curl , glib -, gtk2 , harfbuzz , icu , iniparser @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { pname = "mod_tile"; - version = "0.6.1+unstable=2023-03-09"; + version = "0.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "mod_tile"; - rev = "f521540df1003bb000d7367a59ad612161eab0f0"; - sha256 = "sha256-jIqeplAQt4W97PNKm6ZDGPDUc/PEiLM5yEdPeI+H03A="; + rev = "v${version}"; + hash = "sha256-jDuOcmKzZGU6L0aOfPKRGpDLbX0O9ueTufBy7Bd6KMU="; }; nativeBuildInputs = [ @@ -49,16 +48,20 @@ stdenv.mkDerivation rec { mapnik ]; - # 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; - cmakeFlags = [ "-DENABLE_TESTS=1" ]; + # Explicitly specify directory paths + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man") + (lib.cmakeFeature "CMAKE_INSTALL_MODULESDIR" "modules") + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "") + (lib.cmakeBool "ENABLE_TESTS" doCheck) + ]; + + # And use DESTDIR to define the install destination + installFlags = [ "DESTDIR=$(out)" ]; + doCheck = true; meta = with lib; { |