colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

firefox-extensions: tidy the wrapping and dont double-wrap

Browse Source
This commit is contained in:
Colin
2023-08-06 01:50:40 +00:00
parent c3bb776149
commit 3423f103fc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/additional/firefox-extensions/default.nix
View File

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