Unverified Commit f9aa6104 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

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

parents f38cc637 cfaf8f46
Loading
Loading
Loading
Loading
+18 −6
Original line number Diff line number Diff line
@@ -14133,10 +14133,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 { };
@@ -14193,7 +14201,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;
@@ -14202,7 +14212,9 @@ with pkgs;
  firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { };
  floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { };
  floorp-unwrapped = import ../applications/networking/browsers/floorp {
    inherit stdenv lib fetchFromGitHub buildMozillaMach nixosTests;
  };
  floorp = wrapFirefox floorp-unwrapped { };