public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40610 from andir/firefox-60-aarch64

Browse Source 
firefox: fix build on aarch64 with version >= 60
This commit is contained in:
Andreas Rammhold 2018-05-17 00:23:38 +02:00 committed by GitHub
commit 59e18906bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -28,7 +28,9 @@
# WARNING: NEVER set any of the options below to `true` by default. # WARNING: NEVER set any of the options below to `true` by default.
# Set to `privacySupport` or `false`. # Set to `privacySupport` or `false`.
, webrtcSupport ? !privacySupport # webrtcSupport breaks the aarch64 build on version >= 60.
# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589
, webrtcSupport ? (if lib.versionAtLeast version "60" && stdenv.isAarch64 then false else !privacySupport)
, geolocationSupport ? !privacySupport , geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport , googleAPISupport ? geolocationSupport
, crashreporterSupport ? false , crashreporterSupport ? false

10
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -12,6 +12,12 @@ let
./fix-pa-context-connect-retval.patch ./fix-pa-context-connect-retval.patch
]; ];
firefox60_aarch64_skia_patch = fetchpatch {
name = "aarch64-skia.patch";
url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch;
sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k";
};
in in
rec { rec {
@ -26,7 +32,7 @@ rec {
patches = nixpkgsPatches ++ [ patches = nixpkgsPatches ++ [
./no-buildconfig.patch ./no-buildconfig.patch
]; ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
meta = { meta = {
description = "A web browser built from Firefox source tree"; description = "A web browser built from Firefox source tree";
@ -68,7 +74,7 @@ rec {
patches = nixpkgsPatches ++ [ patches = nixpkgsPatches ++ [
./no-buildconfig.patch ./no-buildconfig.patch
]; ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
meta = firefox.meta // { meta = firefox.meta // {
description = "A web browser built from Firefox Extended Support Release source tree"; description = "A web browser built from Firefox Extended Support Release source tree";