Merge pull request #154184 from sikmir/zombietrackergps

zombietrackergps: 1.03 → 1.10
This commit is contained in:
markuskowa 2022-01-10 19:21:43 +01:00 committed by GitHub
commit 9515c9150f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions

View File

@ -11,13 +11,13 @@
mkDerivation rec {
pname = "zombietrackergps";
version = "1.03";
version = "1.10";
src = fetchFromGitLab {
owner = "ldutils-projects";
repo = pname;
rev = "v_${version}";
sha256 = "1rmdy6kijmcxamm4mqmz8638xqisijlnpv8mimgxywpf90h9rrwq";
sha256 = "sha256-qRhCAOVWyDLD3WDptPRQVq+VwyFu83XQNaL5TMsGs4Y=";
};
buildInputs = [
@ -33,7 +33,10 @@ mkDerivation rec {
];
prePatch = ''
sed -ie "s,INCLUDEPATH += /usr/include/libldutils,INCLUDEPATH += ${ldutils}," ZombieTrackerGPS.pro
substituteInPlace ztgps.pro --replace "../libldutils" "libldutils"
substituteInPlace tests.pro --replace "../libldutils" "libldutils"
ln -s ${ldutils} libldutils
'';
preConfigure = ''
@ -41,10 +44,17 @@ mkDerivation rec {
export INSTALL_ROOT=$out
'';
postConfigure = ''
substituteInPlace Makefile --replace '$(INSTALL_ROOT)' ""
preInstall = ''
substituteInPlace Makefile.ztgps --replace '$(INSTALL_ROOT)' ""
substituteInPlace Makefile.art --replace '$(INSTALL_ROOT)' ""
'';
postInstall = ''
install -Dm644 build/rcc/*.rcc -t $out/share/zombietrackergps
'';
qmakeFlags = [ "ZombieTrackerGPS.pro" ];
meta = with lib; {
description = "GPS track manager for Qt using KDE Marble maps";
homepage = "https://www.zombietrackergps.net/ztgps/";

View File

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "ldutils";
version = "1.03";
version = "1.10";
src = fetchFromGitLab {
owner = "ldutils-projects";
repo = pname;
rev = "v_${version}";
sha256 = "0pi05py71hh5vlhl0kjh9wxmd7yixw10s0kr2wb4l4c0abqxr82j";
sha256 = "sha256-fP+tZY+ayaeuxPvywO/639sNE+IwrxaEJ245q9HTOCU=";
};
buildInputs = [
@ -26,6 +26,8 @@ mkDerivation rec {
qmake
];
qmakeFlags = [ "ldutils.pro" ];
LDUTILS_LIB=placeholder "out";
LDUTILS_INCLUDE=placeholder "out";