{firefox{,-beta,-devedition,-esr-128},floorp,librewolf}-unwrapped: make override work (#356575)

authored by jopejoe1 and committed by GitHub f9aa6104 f38cc637

+18 -6
+18 -6
pkgs/top-level/all-packages.nix
··· 14133 14133 14134 14134 buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { }; 14135 14135 14136 - firefox-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox.nix { }; 14137 - firefox-beta-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-beta.nix { }; 14138 - firefox-devedition-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-devedition.nix { }; 14139 - firefox-esr-128-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix { }; 14136 + firefox-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox.nix { 14137 + inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach; 14138 + }; 14139 + firefox-beta-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-beta.nix { 14140 + inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach; 14141 + }; 14142 + firefox-devedition-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-devedition.nix { 14143 + inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach; 14144 + }; 14145 + firefox-esr-128-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix { 14146 + inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach; 14147 + }; 14140 14148 firefox-esr-unwrapped = firefox-esr-128-unwrapped; 14141 14149 14142 14150 firefox = wrapFirefox firefox-unwrapped { }; ··· 14193 14201 wmClass = "firefox-aurora"; 14194 14202 }; 14195 14203 14196 - librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf { }; 14204 + librewolf-unwrapped = import ../applications/networking/browsers/librewolf { 14205 + inherit stdenv lib callPackage buildMozillaMach nixosTests; 14206 + }; 14197 14207 14198 14208 librewolf = wrapFirefox librewolf-unwrapped { 14199 14209 inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; ··· 14202 14212 14203 14213 firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; 14204 14214 14205 - floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { }; 14215 + floorp-unwrapped = import ../applications/networking/browsers/floorp { 14216 + inherit stdenv lib fetchFromGitHub buildMozillaMach nixosTests; 14217 + }; 14206 14218 14207 14219 floorp = wrapFirefox floorp-unwrapped { }; 14208 14220