diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-02-27 16:08:34 -0500 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-03-09 13:37:30 -0400 |
| commit | d4446c563d5d7f1709cb95ce3731b56ea4578447 (patch) | |
| tree | 2f1d4fccdbec209bbb7a215d7c01f375b9beb6d3 /pkgs/applications/networking/browsers | |
| parent | c6bbad4e8785c09b68a03f16a3884575fd13f855 (diff) | |
firefox: Fix AArch64 build
* The 'arm.patch' patch doesn't apply anymore. * The 'build-arm-libopus.patch' patch isn't required anymore. * See the mozilla phabricator link for the added patch. Additionally, we are now *always* undconditionally applying all patches to all architectures. That is, unless they have undesirable side-effects, but those might not be fit for inclusion. By applying all patches all the time, they'll be removed or replaced when they stop applying.
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4aa8105559b08..7c58072d5af49 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -93,16 +93,12 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; - sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch"; - sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; - }) ] + ++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch { + # https://phabricator.services.mozilla.com/D60667 + url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66"; + sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p"; + }) ++ patches; |