diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-03-09 14:40:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 14:40:20 -0400 |
| commit | b97fce768d8947d451203872271a5b32ab88cb9f (patch) | |
| tree | f8e62825dec5865db0987849443712f3c37280c5 /pkgs/applications/networking/browsers | |
| parent | 15e8320ccd7a84077aa4bbf3e5ad8f357a494d3c (diff) | |
| parent | d4446c563d5d7f1709cb95ce3731b56ea4578447 (diff) | |
Merge pull request #81211 from samueldr/aarch64/firefox-73
firefox: Fix AArch64 build
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; |