From c2df62d50e280933c9fbc88528a078e3baebfe7f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 18 Jan 2025 02:16:20 +0000
Subject: [PATCH] =?UTF-8?q?libsecret:=200.21.4=20=E2=86=92=200.21.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libsecret/-/compare/0.21.4...0.21.6
---
 pkgs/by-name/li/libsecret/package.nix | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix
index 95552812f508..f422de359ca2 100644
--- a/pkgs/by-name/li/libsecret/package.nix
+++ b/pkgs/by-name/li/libsecret/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchurl,
-  fetchpatch2,
   glib,
   meson,
   ninja,
@@ -29,7 +28,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
-  version = "0.21.4";
+  version = "0.21.6";
 
   outputs = [
     "out"
@@ -37,18 +36,10 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-Fj0I14O+bUq5qXnOtaT+y8HZZg08NBaMWBMBzVORKyA=";
+    url = "mirror://gnome/sources/libsecret/${lib.versions.majorMinor version}/libsecret-${version}.tar.xz";
+    hash = "sha256-dHuMF1vhCMiA0637nDU36mblIOStLcz13OWAA67soJA=";
   };
 
-  patches = [
-    # https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/141
-    (fetchpatch2 {
-      url = "https://gitlab.gnome.org/GNOME/libsecret/-/commit/208989323211c756dff690115e5cbde5ef7491ce.patch";
-      hash = "sha256-DtRbqyyoMttEYf6B16m9O72Yjurv6rpbnqH7AlrAU4k=";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];
@@ -90,6 +81,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     (lib.mesonBool "introspection" withIntrospection)
     (lib.mesonBool "gtk_doc" withIntrospection)
+    (lib.mesonOption "bashcompdir" "share/bash-completion/completions")
   ];
 
   doCheck = stdenv.hostPlatform.isLinux && withIntrospection;
@@ -97,6 +89,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs ./tool/test-*.sh
+
+    # dbus-run-session defaults to FHS path
+    substituteInPlace meson.build --replace-fail \
+      "exe_wrapper: dbus_run_session," \
+      "exe_wrapper: [dbus_run_session, '--config-file=${dbus}/share/dbus-1/session.conf'],"
   '';
 
   preCheck = ''
@@ -112,9 +109,7 @@ stdenv.mkDerivation rec {
   checkPhase = ''
     runHook preCheck
 
-    dbus-run-session \
-      --config-file=${dbus}/share/dbus-1/session.conf \
-      meson test --print-errorlogs --timeout-multiplier 0
+    meson test --print-errorlogs --timeout-multiplier 0
 
     runHook postCheck
   '';
@@ -131,7 +126,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libsecret";
       # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30
       versionPolicy = "none";
     };