fix: Waybar overlay includes the patch twice
This commit is contained in:
parent
6e720ad467
commit
97c3cd8141
1 changed files with 9 additions and 6 deletions
15
flake.nix
15
flake.nix
|
@ -86,15 +86,18 @@
|
||||||
jpassmenu = jpassmenu.overlays.default;
|
jpassmenu = jpassmenu.overlays.default;
|
||||||
audiomenu = audiomenu.overlays.default;
|
audiomenu = audiomenu.overlays.default;
|
||||||
"waybar-sway-patch" = final: prev: {
|
"waybar-sway-patch" = final: prev: {
|
||||||
waybar = prev.waybar.overrideAttrs (old: {
|
waybar = prev.waybar.overrideAttrs (old:
|
||||||
patches = (old.patches or [ ]) ++ [
|
let
|
||||||
# Fixes https://github.com/Alexays/Waybar/issues/3009
|
# Fixes https://github.com/Alexays/Waybar/issues/3009
|
||||||
(final.fetchpatch {
|
patch = final.fetchpatch {
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/3037.patch";
|
url = "https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/3037.patch";
|
||||||
hash = "sha256-u87t6zzslk1mzSfi4HQ6zDPFr7qMfsvymTy3HBxVTJQ=";
|
hash = "sha256-u87t6zzslk1mzSfi4HQ6zDPFr7qMfsvymTy3HBxVTJQ=";
|
||||||
})
|
};
|
||||||
];
|
prevPatches = old.patches or [ ];
|
||||||
});
|
# Deduplicate patch
|
||||||
|
present = builtins.elem patch prevPatches;
|
||||||
|
in
|
||||||
|
{ patches = prevPatches ++ final.lib.optional present patch; });
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue