From 28623fb95e565cee9e571e74eaba460c4a9899d1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 12 Feb 2024 10:20:28 +0100 Subject: [PATCH] lomiri.content-hub: Add validatePkgConfig & meta.changelog, fix substituteInPlace warnings --- pkgs/desktops/lomiri/services/content-hub/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lomiri/services/content-hub/default.nix b/pkgs/desktops/lomiri/services/content-hub/default.nix index cd6ba0ce5cf0..17120d5370f5 100644 --- a/pkgs/desktops/lomiri/services/content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/content-hub/default.nix @@ -24,6 +24,7 @@ , qtdeclarative , qtfeedback , qtgraphicaleffects +, validatePkgConfig , wrapGAppsHook , xvfb-run }: @@ -83,15 +84,15 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace import/*/Content/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" # Look for peer files in running system substituteInPlace src/com/lomiri/content/service/registry-updater.cpp \ - --replace '/usr' '/run/current-system/sw' + --replace-fail '/usr' '/run/current-system/sw' # Don't override default theme search path (which honours XDG_DATA_DIRS) with a FHS assumption substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \ - --replace 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' "" + --replace-fail 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' "" ''; strictDeps = true; @@ -101,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { gettext pkg-config qtdeclarative # qmlplugindump + validatePkgConfig wrapGAppsHook ]; @@ -179,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: { even if they are not running at the same time. ''; homepage = "https://gitlab.com/ubports/development/core/content-hub"; + changelog = "https://gitlab.com/ubports/development/core/content-hub/-/blob/${finalAttrs.version}/ChangeLog"; license = with licenses; [ gpl3Only lgpl3Only ]; mainProgram = "content-hub-service"; maintainers = teams.lomiri.members;