diff --git a/pkgs/by-name/ti/tilemaker/package.nix b/pkgs/by-name/ti/tilemaker/package.nix index 82e7840c5c4f..507ac635efff 100644 --- a/pkgs/by-name/ti/tilemaker/package.nix +++ b/pkgs/by-name/ti/tilemaker/package.nix @@ -3,9 +3,7 @@ stdenv, fetchFromGitHub, buildPackages, - fetchpatch, cmake, - installShellFiles, boost, lua, protobuf_21, @@ -13,28 +11,20 @@ shapelib, sqlite, zlib, - testers, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "tilemaker"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "systemed"; repo = "tilemaker"; rev = "v${finalAttrs.version}"; - hash = "sha256-rB5oP03yaIzklwkGsIeS9ELbHOY9AObwjRrK9HBQFI4="; + hash = "sha256-0reO4YYxbFM75CQrSLTybsb5g6PhJaShAtT+X3CaPfM="; }; - patches = [ - # fixes for Boost 1.86 - (fetchpatch { - url = "https://github.com/systemed/tilemaker/commit/6509f0cf50943a90b36b5c6802118b72124b1e7a.patch"; - hash = "sha256-C4aCUGTTUtY24oARihMnljjRbw80xRdMUyvu/b1Nsdw="; - }) - ]; - postPatch = '' substituteInPlace src/options_parser.cpp \ --replace-fail "config.json" "$out/share/tilemaker/config-openmaptiles.json" \ @@ -43,10 +33,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "default_value(\"static\")" "default_value(\"$out/share/tilemaker/static\")" ''; - nativeBuildInputs = [ - cmake - installShellFiles - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost @@ -65,15 +52,12 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ]; postInstall = '' - installManPage ../docs/man/tilemaker.1 install -Dm644 ../resources/*.{json,lua} -t $out/share/tilemaker cp -r ../server/static $out/share/tilemaker ''; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "tilemaker --help"; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { description = "Make OpenStreetMap vector tiles without the stack";