git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115314 from viric/firefox-i686-linux

Allow firefox building in 32-bit systems

commite52507aeac9178a49e25d1561eaaaeda43cbc712 authorBernardo Meurer <bernardo@meurer.org> dateMon 8 Mar 2021, 04:31 (6 years ago) parentcd7edb9d2af381
1 file changed+10−3
pkgs/applications/networking/browsers/firefox/common.nix+10−3
pkgs/applications/networking/browsers/firefox/common.nix+10−3
@@ -23,7 +23,7 @@
2323, ffmpegSupport ? true
2424, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
2525, waylandSupport ? true, libxkbcommon
26−, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages
26+, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
2727, gssSupport ? true, kerberos
2828, pipewireSupport ? waylandSupport && webrtcSupport, pipewire
2929
@@ -111,6 +111,13 @@ let
111111 else stdenv;
112112
113113 nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
114+
115+ # --enable-release adds -ffunction-sections & LTO that require a big amount of
116+ # RAM and the 32-bit memory space cannot handle that linking
117+ # We also disable adding "-g" for easier linking
118+ releaseFlags = if stdenv.is32bit
119+ then [ "--disable-release" "--disable-debug-symbols" ]
120+ else [ "--enable-release" ];
114121in
115122
116123buildStdenv.mkDerivation ({
@@ -296,9 +303,9 @@ buildStdenv.mkDerivation ({
296303 ++ lib.optional drmSupport "--enable-eme=widevine"
297304
298305 ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
299− else [ "--disable-debug" "--enable-release"
306+ else ([ "--disable-debug"
300307 "--enable-optimize"
301− "--enable-strip" ])
308+ "--enable-strip" ] ++ releaseFlags))
302309 ++ lib.optional enableOfficialBranding "--enable-official-branding"
303310 ++ extraConfigureFlags;
304311