From 57431febd78d65b357cf5b11b91b9e6bc1866b50 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 3 Jan 2021 16:36:00 +0100 Subject: simplify pidgin-with-plugins --- overlays/pidgin.nix | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/overlays/pidgin.nix b/overlays/pidgin.nix index 09103ade..d346c7a1 100644 --- a/overlays/pidgin.nix +++ b/overlays/pidgin.nix @@ -1,20 +1,15 @@ final: prev: -prev.lib.composeManyExtensions [ - (final: prev: - let - mucHistory = prev.fetchpatch { - url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch"; - sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44"; - }; - in { - pidgin = prev.pidgin.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or []) ++ [mucHistory]; - }); - }) - (final: prev: { - pidgin-with-plugins = import (/. + prev.path + "/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix") { - inherit (prev) makeWrapper symlinkJoin pidgin; - plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts ]; - }; - }) -] final prev +let + mucHistory = prev.fetchpatch { + url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch"; + sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44"; + }; +in { + pidgin-with-plugins = import (/. + prev.path + "/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix") { + inherit (prev) makeWrapper symlinkJoin; + plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts ]; + pidgin = prev.pidgin.overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or []) ++ [mucHistory]; + }); + }; +} -- cgit v1.2.3