From e909cf117877e67b6c7d651318bbff7b5e92afef Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 10 Nov 2022 09:23:08 +0100 Subject: [PATCH] Streamline overlay overrides st and dmenu are suckless tools where the function already accepts patches. The others should use overrideAttrs to extend existing patches. --- overlays/dmenu/default.nix | 6 +++--- overlays/qogir-theme/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overlays/dmenu/default.nix b/overlays/dmenu/default.nix index 7ec0f81..98f097d 100644 --- a/overlays/dmenu/default.nix +++ b/overlays/dmenu/default.nix @@ -1,7 +1,7 @@ self: super: { - dmenu = super.dmenu.overrideAttrs(old: { - patches = (if old.patches == null then [] else old.patches) ++ [ + dmenu = super.dmenu.override { + patches = [ ./settings.patch ]; - }); + }; } diff --git a/overlays/qogir-theme/default.nix b/overlays/qogir-theme/default.nix index 6266cdf..0cfdda3 100644 --- a/overlays/qogir-theme/default.nix +++ b/overlays/qogir-theme/default.nix @@ -1,6 +1,6 @@ self: super: { qogir-theme = super.qogir-theme.overrideAttrs(old: { - patches = [ + patches = (old.patches or []) ++ [ # TODO: Find out how to properly render inactive menu items # TODO: Find out how to properly render background of selected text # TODO: Properly adjust svgs and then compile them