From ff2fc1424366e6e4e04b0c57154f3f4d5834939e Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Tue, 30 Aug 2022 10:55:38 +0200 Subject: [PATCH] Streamline patches via overlay Do not replace patches, but only add custom patches. --- overlays/dmenu/default.nix | 6 +++--- overlays/purple-slack/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overlays/dmenu/default.nix b/overlays/dmenu/default.nix index 98f097d..7ec0f81 100644 --- a/overlays/dmenu/default.nix +++ b/overlays/dmenu/default.nix @@ -1,7 +1,7 @@ self: super: { - dmenu = super.dmenu.override { - patches = [ + dmenu = super.dmenu.overrideAttrs(old: { + patches = (if old.patches == null then [] else old.patches) ++ [ ./settings.patch ]; - }; + }); } diff --git a/overlays/purple-slack/default.nix b/overlays/purple-slack/default.nix index 301008a..6d20562 100644 --- a/overlays/purple-slack/default.nix +++ b/overlays/purple-slack/default.nix @@ -1,5 +1,5 @@ self: super: { - purple-slack = super.purple-slack.overrideAttrs (old: { + purple-slack = super.purple-slack.overrideAttrs(old: { version = "2022-08-30"; src = super.fetchFromGitHub {