about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCosima Neidahl <opna2608@protonmail.com>2024-02-12 11:05:05 +0100
committerGitHub <noreply@github.com>2024-02-12 11:05:05 +0100
commit084fff92964c928fd884f636a8c06a34779389a5 (patch)
tree388dfe3ad978f002e5dde69614cede1699b23f49
parentb2a95f20e5fe7feaad054e42c9c8aff1bbc2c23a (diff)
parent28623fb95e565cee9e571e74eaba460c4a9899d1 (diff)
downloadnixlib-084fff92964c928fd884f636a8c06a34779389a5.tar
nixlib-084fff92964c928fd884f636a8c06a34779389a5.tar.gz
nixlib-084fff92964c928fd884f636a8c06a34779389a5.tar.bz2
nixlib-084fff92964c928fd884f636a8c06a34779389a5.tar.lz
nixlib-084fff92964c928fd884f636a8c06a34779389a5.tar.xz
nixlib-084fff92964c928fd884f636a8c06a34779389a5.tar.zst
nixlib-084fff92964c928fd884f636a8c06a34779389a5.zip
Merge pull request #288228 from r-ryantm/auto-update/lomiri.content-hub
lomiri.content-hub: 1.1.0 -> 1.1.1
-rw-r--r--pkgs/desktops/lomiri/services/content-hub/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/desktops/lomiri/services/content-hub/default.nix b/pkgs/desktops/lomiri/services/content-hub/default.nix
index 6fe832f417a6..17120d5370f5 100644
--- a/pkgs/desktops/lomiri/services/content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/content-hub/default.nix
@@ -24,19 +24,20 @@
 , qtdeclarative
 , qtfeedback
 , qtgraphicaleffects
+, validatePkgConfig
 , wrapGAppsHook
 , xvfb-run
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "content-hub";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/content-hub";
     rev = finalAttrs.version;
-    hash = "sha256-IntEpgPCBmOL6K6TU+UhgGb6OHVA9pYurK5VN3woIIw=";
+    hash = "sha256-sQeyJV+Wc6PHKGIefl/dfU06XqTdICsn+Xamjx3puiI=";
   };
 
   outputs = [
@@ -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;