diff options
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ffe1786be32ec..4396d7e85d419 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -236,6 +236,15 @@ buildStdenv.mkDerivation { ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch + ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [ + (fetchpatch { + # Do not crash on systems without an expected statically assumed page size. + # https://phabricator.services.mozilla.com/D194458 + name = "mozbz1866025.patch"; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951"; + hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM="; + }) + ] ++ extraPatches; postPatch = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 801e1ca0ad407..2cc9f9d54bd0b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -10,13 +10,6 @@ }; extraPatches = [ - (fetchpatch { - # Do not crash on systems without an expected statically assumed page size. - # https://phabricator.services.mozilla.com/D194458 - name = "mozbz1866025.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951"; - hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM="; - }) ]; meta = { |