colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lomiri.content-hub: Add validatePkgConfig & meta.changelog, fix substituteInPlace warnings

Browse Source
This commit is contained in:
OPNA2608 2024-02-12 10:20:28 +01:00
parent 08de1d9de7
commit 28623fb95e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/lomiri/services/content-hub/default.nix
View File

@ -24,6 +24,7 @@
, qtdeclarative , qtdeclarative
, qtfeedback , qtfeedback
, qtgraphicaleffects , qtgraphicaleffects
, validatePkgConfig
, wrapGAppsHook , wrapGAppsHook
, xvfb-run , xvfb-run
}: }:
@ -83,15 +84,15 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = '' postPatch = ''
substituteInPlace import/*/Content/CMakeLists.txt \ 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 # Look for peer files in running system
substituteInPlace src/com/lomiri/content/service/registry-updater.cpp \ 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 # Don't override default theme search path (which honours XDG_DATA_DIRS) with a FHS assumption
substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \ substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \
--replace 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' "" --replace-fail 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' ""
''; '';
strictDeps = true; strictDeps = true;
@ -101,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
gettext gettext
pkg-config pkg-config
qtdeclarative # qmlplugindump qtdeclarative # qmlplugindump
validatePkgConfig
wrapGAppsHook wrapGAppsHook
]; ];
@ -179,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
even if they are not running at the same time. even if they are not running at the same time.
''; '';
homepage = "https://gitlab.com/ubports/development/core/content-hub"; 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 ]; license = with licenses; [ gpl3Only lgpl3Only ];
mainProgram = "content-hub-service"; mainProgram = "content-hub-service";
maintainers = teams.lomiri.members; maintainers = teams.lomiri.members;