Merge pull request #105437 from andir/firefox-aarch64

firefox: fix aarch64 build
This commit is contained in:
Andreas Rammhold 2020-12-01 01:18:37 +01:00 committed by GitHub
commit eb1cd583f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions

View file

@ -118,6 +118,7 @@ buildStdenv.mkDerivation ({
patches = [
./env_var_for_system_dir.patch
./no-buildconfig-ffx76.patch
] ++
# there are two flavors of pipewire support

View file

@ -1,4 +1,4 @@
{ config, stdenv, lib, callPackage, fetchurl, nss_3_44 }:
{ stdenv, lib, callPackage, fetchurl, fetchpatch }:
let
common = opts: callPackage (import ./common.nix opts) {};
@ -14,7 +14,14 @@ rec {
};
patches = [
./no-buildconfig-ffx76.patch
# Fix compilation on aarch64 with newer rust version
# See https://bugzilla.mozilla.org/show_bug.cgi?id=1677690
# and https://bugzilla.redhat.com/show_bug.cgi?id=1897675
(fetchpatch {
name = "aarch64-simd-bgz-1677690.patch";
url = "https://github.com/mozilla/gecko-dev/commit/71597faac0fde4f608a60dd610d0cefac4972cc3.patch";
sha256 = "1f61nsgbv2c2ylgjs7wdahxrrlgc19gjy5nzs870zr1g832ybwin";
})
];
meta = {
@ -41,10 +48,6 @@ rec {
sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd";
};
patches = [
./no-buildconfig-ffx76.patch
];
meta = {
description = "A web browser built from Firefox Extended Support Release source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";