From 809593e7623cf05383c7ad99d003ce1d99013a1f Mon Sep 17 00:00:00 2001 From: sohalt Date: Sat, 30 Mar 2024 16:27:59 +0100 Subject: zombietrackergps: 1.10 -> 1.15 --- pkgs/applications/gis/zombietrackergps/default.nix | 74 ++++++++++------------ 1 file changed, 34 insertions(+), 40 deletions(-) (limited to 'pkgs/applications/gis') diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix index 47a4329ae19d9..4acedbac2a2f8 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -1,67 +1,61 @@ -{ mkDerivation -, lib -, fetchFromGitLab -, qmake -, qtcharts -, qtsvg -, marble -, qtwebengine -, ldutils +{ + mkDerivation, + lib, + fetchFromGitLab, + gitUpdater, + wrapQtAppsHook, + cmake, + marble, + libsForQt5, }: - mkDerivation rec { pname = "zombietrackergps"; - version = "1.10"; + version = "1.15"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; - rev = "v_${version}"; - sha256 = "sha256-qRhCAOVWyDLD3WDptPRQVq+VwyFu83XQNaL5TMsGs4Y="; + # latest revision is not tagged upstream, use commit sha in the meantime + #rev = "v_${version}"; + rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce"; + sha256 = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; }; - buildInputs = [ - ldutils - qtcharts - qtsvg - marble.dev - qtwebengine - ]; + buildInputs = + [ + marble.dev + ] + ++ (with libsForQt5; [ + qtbase + qtcharts + qtsvg + qtwebengine + ldutils + ]); nativeBuildInputs = [ - qmake + cmake + wrapQtAppsHook ]; - prePatch = '' - substituteInPlace ztgps.pro --replace "../libldutils" "libldutils" - substituteInPlace tests.pro --replace "../libldutils" "libldutils" - - ln -s ${ldutils} libldutils - ''; - preConfigure = '' export LANG=en_US.UTF-8 - export INSTALL_ROOT=$out ''; - preInstall = '' - substituteInPlace Makefile.ztgps --replace '$(INSTALL_ROOT)' "" - substituteInPlace Makefile.art --replace '$(INSTALL_ROOT)' "" - ''; - - postInstall = '' - install -Dm644 build/rcc/*.rcc -t $out/share/zombietrackergps - ''; + cmakeFlags = [ + "-DLDUTILS_ROOT=${libsForQt5.ldutils}" + ]; - qmakeFlags = [ "ZombieTrackerGPS.pro" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v_"; + }; meta = with lib; { description = "GPS track manager for Qt using KDE Marble maps"; homepage = "https://www.zombietrackergps.net/ztgps/"; changelog = "https://www.zombietrackergps.net/ztgps/history.html"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sohalt ]; + maintainers = with maintainers; [sohalt]; platforms = platforms.linux; - broken = true; # doesn't build with latest Marble }; } -- cgit 1.4.1