From 3423f103fc4026af4fc99d0cc0a06f4a083fc357 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 6 Aug 2023 01:50:40 +0000
Subject: [PATCH] firefox-extensions: tidy the wrapping and dont double-wrap

---
 pkgs/additional/firefox-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/additional/firefox-extensions/default.nix b/pkgs/additional/firefox-extensions/default.nix
index f3dffdbfe..cbbd68d6b 100644
--- a/pkgs/additional/firefox-extensions/default.nix
+++ b/pkgs/additional/firefox-extensions/default.nix
@@ -29,7 +29,7 @@ let
     };
   in (stdenv.mkDerivation ({
     # heavily borrows from <repo:nixos/nixpkgs:pkgs/build-support/fetchfirefoxaddon/default.nix>
-    inherit (addon) name;
+    name = "${addon.name}-wrapped";
     unpackPhase = ''
       echo "patching firefox addon $name into $out/${extid}.xpi"
 
@@ -64,7 +64,7 @@ let
     '';
   } // args')).overrideAttrs (final: upstream: {
     passthru = (upstream.passthru or {}) // {
-      withAttrs = attrs: wrapAddon final.finalPackage attrs;
+      withAttrs = attrs: wrapAddon addon (args // attrs);
       withPostPatch = postPatch: final.passthru.withAttrs { inherit postPatch; };
       # given an addon, repackage it without some `perm`ission
       withoutPermission = perm: final.passthru.withPostPatch ''