Unverified Commit 5b500587 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #270744 from yu-re-ka/mozilla-page-size 

firefox: move page size patch to buildMozillaMach
parents f62a39f2 3219a1f4

pkgs/applications/networking/browsers/firefox/common.nix

+9 −0
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/applications/networking/browsers/firefox/packages.nix

+0 −7
Original line number Diff line number Diff line
@@ -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 = {