git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commitd4446c563d5d7f1709cb95ce3731b56ea4578447 authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateThu 27 Feb 2020, 16:08 (7 years ago) parentc6bbad4
1 file changed+5−9
pkgs/applications/networking/browsers/firefox/common.nix+5−9
pkgs/applications/networking/browsers/firefox/common.nix+5−9
@@ -93,16 +93,12 @@ stdenv.mkDerivation ({
9393
9494 patches = [
9595 ./env_var_for_system_dir.patch
96− ] ++ lib.optionals (stdenv.isAarch64) [
97− (fetchpatch {
98− url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch";
99− sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32";
100− })
101− (fetchpatch {
102− url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch";
103− sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
104− })
10596 ]
97+ ++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch {
98+ # https://phabricator.services.mozilla.com/D60667
99+ url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66";
100+ sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p";
101+ })
106102 ++ patches;
107103
108104