From b16df2a922448e316bda92748b1cdb4b1a48fb13 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 23 Mar 2026 10:51:42 +0100
Subject: [PATCH] cosmic-settings-daemon: deduplicate dbus-settings-bindings

---
 .../dedup-dbus-settings-bindings.patch        | 31 +++++++++++++++++++
 .../co/cosmic-settings-daemon/package.nix     |  9 +++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/co/cosmic-settings-daemon/dedup-dbus-settings-bindings.patch

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/dedup-dbus-settings-bindings.patch b/pkgs/by-name/co/cosmic-settings-daemon/dedup-dbus-settings-bindings.patch
new file mode 100644
index 000000000000..d9859274e295
--- /dev/null
+++ b/pkgs/by-name/co/cosmic-settings-daemon/dedup-dbus-settings-bindings.patch
@@ -0,0 +1,31 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index e8a98ee..3902dcf 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -912,7 +912,7 @@ dependencies = [
+ [[package]]
+ name = "cosmic-dbus-a11y"
+ version = "0.1.0"
+-source = "git+https://github.com/pop-os/dbus-settings-bindings#3b86984332be2c930a3536ab714b843c851fa8ca"
++source = "git+https://github.com/pop-os/dbus-settings-bindings#0fa672f8dadb884001ef9a251b149ed432879629"
+ dependencies = [
+  "zbus",
+ ]
+@@ -3160,7 +3160,7 @@ checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
+ [[package]]
+ name = "locale1"
+ version = "0.1.0"
+-source = "git+https://github.com/pop-os/dbus-settings-bindings#3b86984332be2c930a3536ab714b843c851fa8ca"
++source = "git+https://github.com/pop-os/dbus-settings-bindings#0fa672f8dadb884001ef9a251b149ed432879629"
+ dependencies = [
+  "zbus",
+ ]
+@@ -5577,7 +5577,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+ [[package]]
+ name = "upower_dbus"
+ version = "0.3.2"
+-source = "git+https://github.com/pop-os/dbus-settings-bindings#3b86984332be2c930a3536ab714b843c851fa8ca"
++source = "git+https://github.com/pop-os/dbus-settings-bindings#0fa672f8dadb884001ef9a251b149ed432879629"
+ dependencies = [
+  "serde",
+  "serde_repr",
diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index add7f40bfcf0..b50b70f827bd 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -26,6 +26,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-np1syOfFqL6eZpnlwNb8WOXB0oqSkxIshX0JiyDlN1A=";
   };
 
+  cargoPatches = [
+    # The lockfile references two different revisions of the same internal repository dbus-settings-bindings,
+    # which likely is unintentional and currently causing issues with fetchCargoVendor.
+    # Upstream PR: https://github.com/pop-os/cosmic-settings-daemon/pull/139
+    ./dedup-dbus-settings-bindings.patch
+  ];
+
   postPatch = ''
     substituteInPlace src/battery.rs \
       --replace-fail '/usr/share/sounds/Pop/' '${pop-gtk-theme}/share/sounds/Pop/'
@@ -33,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
   '';
 
-  cargoHash = "sha256-p0Dda0Chy8qJNIMAbSnqeC8kHDYIf4tsk7+NCd9/nDQ=";
+  cargoHash = "sha256-r9ZL3eNvoCWHFfxzSrETewPXIo+aGebWzBk19ra4AXY=";
 
   nativeBuildInputs = [ pkg-config ];