diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/by-name/zo/zombietrackergps/package.nix similarity index 76% rename from pkgs/applications/gis/zombietrackergps/default.nix rename to pkgs/by-name/zo/zombietrackergps/package.nix index 3cc6bf69e45c..46660eef0d97 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/by-name/zo/zombietrackergps/package.nix @@ -1,40 +1,36 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, gitUpdater, - wrapQtAppsHook, cmake, - marble, libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation { pname = "zombietrackergps"; version = "1.15"; src = fetchFromGitLab { owner = "ldutils-projects"; - repo = pname; + repo = "zombietrackergps"; # latest revision is not tagged upstream, use commit sha in the meantime #rev = "v_${version}"; rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce"; hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; }; - buildInputs = [ + buildInputs = with libsForQt5; [ marble.dev - ] - ++ (with libsForQt5; [ qtbase qtcharts qtsvg qtwebengine ldutils - ]); + ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; preConfigure = '' @@ -49,12 +45,12 @@ mkDerivation rec { rev-prefix = "v_"; }; - meta = with lib; { + meta = { 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 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sohalt ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00d9bac7601c..f087d312f5ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11514,8 +11514,6 @@ with pkgs; wxGTK = wxGTK32; }; - zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; - ### APPLICATIONS _2bwm = callPackage ../applications/window-managers/2bwm {