gcr: 3.41.0 → 3.41.1

https://gitlab.gnome.org/GNOME/gcr/-/compare/3.41.0...3.41.1

- Enabled API docs since they now switched to gi-docgen.
- Freezing updates since the next version is API-incompatible gcr4.

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

pkgs/development/libraries/gcr/default.nix

@@ -1,6 +1,6 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
-, fetchpatch
 , pkg-config
 , meson
 , ninja
@@ -17,7 +17,7 @@
 , systemd
 , gobject-introspection
 , wrapGAppsHook
-, libxslt
+, gi-docgen
 , vala
 , gnome
 , python3
@@ -26,25 +26,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gcr";
-  version = "3.41.0";
+  version = "3.41.1";
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE=";
+    sha256 = "u3Eoo8L+u/7pwDuQ131JjQzrI3sHiYAtYBhcccS+ok8=";
   };
 
-  patches = [
-    # Pull upstream fix for meson-0.60:
-    #  https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
-    (fetchpatch {
-      name = "meson-0.60.patch";
-      url = "https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch";
-      sha256 = "15gwxkcm5q5p87p5lrqwgykpzx5gmk179xd3481yak93yhbvy165";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
     meson
@@ -52,7 +42,7 @@ stdenv.mkDerivation rec {
     ninja
     gettext
     gobject-introspection
-    libxslt
+    gi-docgen
     wrapGAppsHook
     vala
     shared-mime-info
@@ -79,7 +69,6 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dgtk_doc=false"
     # We are still using ssh-agent from gnome-keyring.
     # https://github.com/NixOS/nixpkgs/issues/140824
     "-Dssh_agent=false"
@@ -90,15 +79,21 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
 
   postPatch = ''
-    patchShebangs build/ gcr/fixtures/
+    patchShebangs gcr/fixtures/
 
     chmod +x meson_post_install.py
     patchShebangs meson_post_install.py
   '';
 
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = pname;
+      freeze = true;
     };
   };