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

Merge pull request #115314 from viric/firefox-i686-linux

Browse Source 
Allow firefox building in 32-bit systems
This commit is contained in:
Bernardo Meurer 2021-03-08 04:31:07 +00:00 committed by GitHub
commit e52507aeac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
, ffmpegSupport ? true , ffmpegSupport ? true
, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
, waylandSupport ? true, libxkbcommon , waylandSupport ? true, libxkbcommon
, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, gssSupport ? true, kerberos , gssSupport ? true, kerberos
, pipewireSupport ? waylandSupport && webrtcSupport, pipewire , pipewireSupport ? waylandSupport && webrtcSupport, pipewire
@ -111,6 +111,13 @@ let
else stdenv; else stdenv;
nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
# --enable-release adds -ffunction-sections & LTO that require a big amount of
# RAM and the 32-bit memory space cannot handle that linking
# We also disable adding "-g" for easier linking
releaseFlags = if stdenv.is32bit
then [ "--disable-release" "--disable-debug-symbols" ]
else [ "--enable-release" ];
in in
buildStdenv.mkDerivation ({ buildStdenv.mkDerivation ({
@ -296,9 +303,9 @@ buildStdenv.mkDerivation ({
++ lib.optional drmSupport "--enable-eme=widevine" ++ lib.optional drmSupport "--enable-eme=widevine"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
else [ "--disable-debug" "--enable-release" else ([ "--disable-debug"
"--enable-optimize" "--enable-optimize"
"--enable-strip" ]) "--enable-strip" ] ++ releaseFlags))
++ lib.optional enableOfficialBranding "--enable-official-branding" ++ lib.optional enableOfficialBranding "--enable-official-branding"
++ extraConfigureFlags; ++ extraConfigureFlags;