From 4cf191665b0b92406a67d9024c7f9c7c786f68df Mon Sep 17 00:00:00 2001 From: Salva Date: Wed, 24 Jun 2026 01:34:24 -0600 Subject: [PATCH] cosmic-applets: deduplicate cosmic-settings-daemon sources (cherry picked from commit ebdad0a6b428f19ad1054c209693f1d195c80a32) --- .../dedup-cosmic-settings-daemon.patch | 13 +++++++++++++ pkgs/by-name/co/cosmic-applets/package.nix | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch diff --git a/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch b/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch new file mode 100644 index 000000000000..d800685e4c23 --- /dev/null +++ b/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bdd37740..c1adcfad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1514,7 +1514,7 @@ dependencies = [ + [[package]] + name = "cosmic-settings-config" + version = "0.1.0" +-source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47" ++source = "git+https://github.com/pop-os/cosmic-settings-daemon#e7936f0d4f01c8c5a436908c7ee9f6ad43e6a7d8" + dependencies = [ + "cosmic-config", + "ron 0.11.0", diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 7539b7dcbae7..3bf2a2fbc3e2 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -30,6 +30,12 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-A8Qk9u3Q83Q4AjzTrdptfS9UNoyKq39YihC4d/dNBYc="; }; + cargoPatches = [ + # A different reference to the `cosmic-settings-daemon` crate was added + # Remove this patch once upstream fixes their lockfile. + ./dedup-cosmic-settings-daemon.patch + ]; + cargoHash = "sha256-81BFu13QmqOq43iN+ORQuktisEFYRrK+wd6diFfSufs="; separateDebugInfo = true;