From f2490908f1255c9baf64eef7e82b58995b646250 Mon Sep 17 00:00:00 2001 From: Salva Date: Tue, 23 Jun 2026 19:43:51 -0600 Subject: [PATCH] cosmic-settings: deduplicate multiple libcosmic sources --- .../co/cosmic-settings/dedup-libcosmic.patch | 112 ++++++++++++++++++ pkgs/by-name/co/cosmic-settings/package.nix | 6 + 2 files changed, 118 insertions(+) create mode 100644 pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch diff --git a/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch b/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch new file mode 100644 index 000000000000..00d00905de3b --- /dev/null +++ b/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch @@ -0,0 +1,112 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 46d491a..ea60cd9 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1774,7 +1774,7 @@ dependencies = [ + [[package]] + name = "cosmic-theme" + version = "1.0.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "almost", + "configparser", +@@ -3158,7 +3158,7 @@ dependencies = [ + [[package]] + name = "iced" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "dnd", + "iced_accessibility", +@@ -3214,7 +3214,7 @@ dependencies = [ + [[package]] + name = "iced_debug" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_core", + "iced_futures", +@@ -3238,7 +3238,7 @@ dependencies = [ + [[package]] + name = "iced_graphics" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bitflags 2.12.1", + "bytemuck", +@@ -3259,7 +3259,7 @@ dependencies = [ + [[package]] + name = "iced_program" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_graphics", + "iced_runtime", +@@ -3268,7 +3268,7 @@ dependencies = [ + [[package]] + name = "iced_renderer" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_graphics", + "iced_tiny_skia", +@@ -3280,7 +3280,7 @@ dependencies = [ + [[package]] + name = "iced_runtime" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bytes", + "cosmic-client-toolkit", +@@ -3296,7 +3296,7 @@ dependencies = [ + [[package]] + name = "iced_tiny_skia" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bytemuck", + "cosmic-text", +@@ -3313,7 +3313,7 @@ dependencies = [ + [[package]] + name = "iced_wgpu" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "as-raw-xcb-connection", + "bitflags 2.12.1", +@@ -3344,7 +3344,7 @@ dependencies = [ + [[package]] + name = "iced_widget" + version = "0.14.2" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "cosmic-client-toolkit", + "dnd", +@@ -3364,7 +3364,7 @@ dependencies = [ + [[package]] + name = "iced_winit" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "cosmic-client-toolkit", + "cursor-icon", +@@ -4455,7 +4455,7 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + [[package]] + name = "libcosmic" + version = "1.0.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "apply", + "ashpd 0.12.3", diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 0946a83cec7f..5320de71ee47 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -37,6 +37,12 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-LfhFza0G85+fIuACMdwV50Okh5/46z8tLoJ9IvLqTgw="; }; + cargoPatches = [ + # A different reference to the `libcosmic` crate was added + # Remove this patch once upstream fixes their lockfile. + ./dedup-libcosmic.patch + ]; + cargoHash = "sha256-rYjizOCcLJ4aq3UB5xEwWq5+KvrSi5PCUTIwUM/wegM="; separateDebugInfo = true;