From ba781eb790437b41e2e047e4d492fc441eb3fa7c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 7 Aug 2024 13:36:04 +0000
Subject: [PATCH] =?UTF-8?q?gnome-online-accounts:=203.50.4=20=E2=86=92=203?=
 =?UTF-8?q?.51.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.50.4...3.51.1

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
---
 .../gnome-online-accounts/default.nix         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index 8a1773612f2d..0ba8e44d92ca 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -10,17 +10,17 @@
 , gtk4
 , enableBackend ? stdenv.hostPlatform.isLinux
 , json-glib
+, keyutils
 , libadwaita
 , librest_1_0
 , libxml2
 , libsecret
-, gtk-doc
 , gobject-introspection
 , gettext
+, gi-docgen
 , glib-networking
 , libsoup_3
 , docbook-xsl-nons
-, docbook_xml_dtd_412
 , gnome
 , gcr_4
 , libkrb5
@@ -31,30 +31,29 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-online-accounts";
-  version = "3.50.4";
+  version = "3.51.1";
 
   outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MMoTA4zXpp1bay1TZD+6ZUjRcSuSXwwhbzEzw2y/d3M=";
+    hash = "sha256-LfoklMDCO8lmMgluuLxzWRk/780+RCNTugqMNHNFtDI=";
   };
 
   mesonFlags = [
     "-Dfedora=false" # not useful in NixOS or for NixOS users.
     "-Dgoabackend=${lib.boolToString enableBackend}"
-    "-Dgtk_doc=${lib.boolToString enableBackend}"
+    "-Ddocumentation=${lib.boolToString enableBackend}"
     "-Dman=${lib.boolToString enableBackend}"
     "-Dwebdav=true"
   ];
 
   nativeBuildInputs = [
     dbus # used for checks and pkg-config to install dbus service/s
-    docbook_xml_dtd_412
-    docbook-xsl-nons
+    docbook-xsl-nons # for goa-daemon.xml
     gettext
+    gi-docgen
     gobject-introspection
-    gtk-doc
     libxslt
     meson
     ninja
@@ -76,8 +75,15 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     libsecret
     libsoup_3
+  ] ++ lib.optionals enableBackend [
+    keyutils
   ];
 
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
   separateDebugInfo = true;
 
   passthru = {