[Backport release-24.05] {firefox{,-beta,-devedition,-esr-128},floorp,librewolf}-unwrapped: make override work (#356588)

This commit is contained in:
jopejoe1 2024-11-16 23:47:34 +01:00 committed by GitHub
commit e8c38b73ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -30985,10 +30985,18 @@ with pkgs;
buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { };
firefox-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox.nix { };
firefox-beta-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-beta.nix { };
firefox-devedition-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-devedition.nix { };
firefox-esr-128-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix { };
firefox-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-beta-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-beta.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-devedition-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-devedition.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-esr-128-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-esr-unwrapped = firefox-esr-128-unwrapped;
firefox = wrapFirefox firefox-unwrapped { };
@ -31048,7 +31056,9 @@ with pkgs;
wmClass = "firefox-aurora";
};
librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf { };
librewolf-unwrapped = import ../applications/networking/browsers/librewolf {
inherit stdenv lib callPackage buildMozillaMach nixosTests;
};
librewolf = wrapFirefox librewolf-unwrapped {
inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles;
@ -31067,7 +31077,9 @@ with pkgs;
flex-ndax = callPackage ../applications/radio/flex-ndax { };
floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { };
floorp-unwrapped = import ../applications/networking/browsers/floorp {
inherit stdenv lib fetchFromGitHub buildMozillaMach nixosTests python311 fetchpatch;
};
floorp = wrapFirefox floorp-unwrapped { };