mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
cosmic-osd: deduplicate the dual sources for the cosmic-settings crate
This commit is contained in:
parent
0a02121870
commit
1420532dfa
2 changed files with 39 additions and 1 deletions
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 8b6704e..64c1691 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1104,7 +1104,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-airplane-mode-subscription"
|
||||
version = "1.0.7"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
@@ -1150,7 +1150,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-pulse-subscription"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
@@ -1162,7 +1162,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-upower-subscription"
|
||||
version = "1.0.7"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
|
|
@ -25,7 +25,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
hash = "sha256-jv28hxhQUcUDLnOwU3xQJwCU+s52pwDNs8Gf4I5Hp9k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BngWy8fSfmQYSLV+/3jBvDdI0lpTwqGUiwwHvDlqySw=";
|
||||
cargoHash = "sha256-YwZXlhggrUddxour+/S1mSL3Fq1mzvFaOHArLSnfPvc=";
|
||||
|
||||
cargoPatches = [
|
||||
# A different reference to the `cargo-settings` crate was added in:
|
||||
# <https://github.com/pop-os/cosmic-osd/pull/204>
|
||||
# Remove this patch once upstream fixes their lockfile.
|
||||
./deduplicate-cosmic-settings-crate.patch
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue