From 82f141c0df978c0e41f530def2558d9fd15a7db2 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 17 Jul 2023 22:27:49 +0000 Subject: [PATCH] firefox-extensions: make it a scope --- pkgs/additional/firefox-extensions/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/additional/firefox-extensions/default.nix b/pkgs/additional/firefox-extensions/default.nix index aed7400e..81096256 100644 --- a/pkgs/additional/firefox-extensions/default.nix +++ b/pkgs/additional/firefox-extensions/default.nix @@ -4,6 +4,7 @@ , gnused , jq , lib +, newScope , strip-nondeterminism , unzip , writeScript @@ -79,8 +80,7 @@ let # extid can be found by unar'ing the above xpi, and copying browser_specific_settings.gecko.id field passthru = { inherit extid; }; }; -in rec { - # TODO: make this a scope, so it can be override'able +in lib.makeScope newScope (self: with self; { unwrapped = lib.recurseIntoAttrs { # get names from: # - ~/ref/nix-community/nur-combined/repos/rycee/pkgs/firefox-addons/generated-firefox-addons.nix @@ -116,5 +116,4 @@ in rec { ublacklist = wrapAddon unwrapped.ublacklist {}; ublock-origin = wrapAddon unwrapped.ublock-origin {}; - -} +})