Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3f929f738e06
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9fcf3e5c253e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 17, 2021

  1. firefox: limit disable-elf-hack to arm, x86{,_64} 

    This is a follow up to #106617 which brought LTO support but broke the
AArch64 Firefox builds.
    @S-NA
    S-NA committed Jan 17, 2021
    Copy the full SHA
    00b75b7 View commit details

  2. Merge pull request #109598 from S-NA/wip/firefox-aarch64-lto 

    firefox: limit disable-elf-hack to arm, x86{,_64}
    @lovesegfault
    lovesegfault authored Jan 17, 2021
    Copy the full SHA
    9fcf3e5 View commit details
Showing with 3 additions and 4 deletions.
  1. +3 −4 pkgs/applications/networking/browsers/firefox/common.nix
7 changes: 3 additions & 4 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -296,10 +296,9 @@ buildStdenv.mkDerivation ({
# https://bugzilla.mozilla.org/show_bug.cgi?id=1538724
# elf-hack is broken when using clang+lld:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
++ lib.optionals ltoSupport [
"--enable-lto"
"--disable-elf-hack"
] ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld"
++ lib.optional ltoSupport "--enable-lto"
++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack"
++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld"

++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"