From fc17b8e77f526379a9d4927826459ac98feb27b9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 20 Dec 2024 15:57:27 +0100 Subject: [PATCH] {libsForQt5,qt6Packages}.timed: init at 3.6.23 --- pkgs/applications/system/timed/default.nix | 120 +++++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + pkgs/top-level/qt6-packages.nix | 2 + 3 files changed, 124 insertions(+) create mode 100644 pkgs/applications/system/timed/default.nix diff --git a/pkgs/applications/system/timed/default.nix b/pkgs/applications/system/timed/default.nix new file mode 100644 index 000000000000..52f5f0c87efb --- /dev/null +++ b/pkgs/applications/system/timed/default.nix @@ -0,0 +1,120 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + testers, + libiodata, + pcre-cpp, + pkg-config, + qmake, + qtbase, + sailfish-access-control, + tzdata, + wrapQtAppsHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "timed"; + version = "3.6.23"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "sailfishos"; + repo = "timed"; + tag = finalAttrs.version; + hash = "sha256-EJ0xxAkrISQfylBneYAEOINRvMUTWWw4E5GKjbq67aU="; + }; + + postPatch = '' + substituteInPlace src/{lib/lib,voland/voland}.pro \ + --replace-fail '$$[QT_INSTALL_LIBS]' "$lib/lib" \ + --replace-fail '/usr/include' "$dev/include" \ + --replace-fail '$$[QT_INSTALL_DATA]' "$dev" + + substituteInPlace src/server/server.pro \ + --replace-fail '/usr/bin' "$out/bin" \ + --replace-fail '/etc' "$out/etc" \ + --replace-fail '/usr/lib' "$out/lib" + + substituteInPlace tests/tests.pro \ + --replace-fail '/opt' "$dev/opt" \ + + substituteInPlace tests/ut_networktime/ut_networktime.pro \ + --replace-fail '/opt' "$dev/opt" \ + --replace-fail '/etc' "$dev/etc" + + substituteInPlace tests/tst_events/tst_events.pro \ + --replace-fail '/opt' "$dev/opt" + + substituteInPlace tools/timedclient/timedclient.pro \ + --replace-fail '/usr/bin' "$out/bin" + + substituteInPlace \ + src/lib/aliases.cpp \ + src/server/settings.cpp \ + --replace-fail '/usr/share/zoneinfo' '${tzdata}/share/zoneinfo' + ''; + + # QMake doesn't handle this well + strictDeps = false; + + nativeBuildInputs = [ + pkg-config + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + libiodata + pcre-cpp + sailfish-access-control + ]; + + # Do all configuring now, not during build + postConfigure = '' + make qmake_all + ''; + + env = { + TIMED_VERSION = "${finalAttrs.version}"; + + # Other subprojects expect library to already be present + NIX_CFLAGS_COMPILE = "-isystem ${placeholder "dev"}/include"; + NIX_LDFLAGS = "-L${placeholder "out"}/lib"; + }; + + preBuild = '' + pushd src/lib + make ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} + make install + popd + ''; + + passthru = { + updateScript = gitUpdater { }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + # Version fields exclude patch-level + }; + }; + + meta = { + description = "Time daemon managing system time, time zone and settings"; + homepage = "https://github.com/sailfishos/timed"; + changelog = "https://github.com/sailfishos/timed/releases/tag/${finalAttrs.version}"; + license = lib.licenses.lgpl21Only; + mainProgram = "timed"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + pkgConfigModules = [ + "timed-qt${lib.versions.major qtbase.version}" + "timed-voland-qt${lib.versions.major qtbase.version}" + ]; + }; +}) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 12051ad9e164..25a2d71a164e 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -291,6 +291,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP soundkonverter = callPackage ../applications/audio/soundkonverter {}; + timed = callPackage ../applications/system/timed { }; + xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index a7377c30ff51..ef464b48cd6a 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -124,6 +124,8 @@ makeScopeWithSplicing' { signond = callPackage ../development/libraries/signond {}; + timed = callPackage ../applications/system/timed { }; + waylib = callPackage ../development/libraries/waylib { }; wayqt = callPackage ../development/libraries/wayqt { };