firefox-esr: build on 32-bit (#542781)
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
callPackage,
|
||||
fetchurl,
|
||||
@@ -22,9 +21,6 @@ buildMozillaMach rec {
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.buildPlatform.is32bit;
|
||||
# since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "firefox";
|
||||
|
||||
@@ -145,7 +145,13 @@ in
|
||||
),
|
||||
overrideCC,
|
||||
buildPackages,
|
||||
pgoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform),
|
||||
# PGO merges profile data with a 32-bit llvm-profdata, which runs out of
|
||||
# address space on the huge libxul profile, so disable it on 32-bit.
|
||||
pgoSupport ? (
|
||||
stdenv.hostPlatform.isLinux
|
||||
&& stdenv.hostPlatform == stdenv.buildPlatform
|
||||
&& stdenv.hostPlatform.is64bit
|
||||
),
|
||||
xvfb-run,
|
||||
elfhackSupport ?
|
||||
isElfhackPlatform stdenv && !(stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64),
|
||||
|
||||
@@ -8684,7 +8684,6 @@ with pkgs;
|
||||
import ../applications/networking/browsers/firefox/packages/firefox-esr-140.nix
|
||||
{
|
||||
inherit
|
||||
stdenv
|
||||
lib
|
||||
callPackage
|
||||
fetchurl
|
||||
|
||||
Reference in New Issue
Block a user