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
base: e1545d42aac0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: aa4a14b7ad26
Choose a head ref
  • 8 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 13, 2021

  1. firefox: remove superfluous NIX_CFLAGS_COMPILE

    It was added for nspr and nss back in the 55.0.3 to 56.0 upgrade. It
    also served as a workaround for an undeclared gio-unix-2.0 dependency.
    Sometime afterwards nspr was removed, leaving just the two. Since then,
    upstream has added a declaration for gio-unix-2.0 (in FF62). As for the
    nss include it seemingly has no purpose since current firefox builds
    with it removed.
    S-NA committed Jan 13, 2021
    Copy the full SHA
    c6f113a View commit details
    Browse the repository at this point in the history
  2. firefox: restrict system NSPR workaround

    It only affected FF80 so place an upper bound restriction. See
    bmo#1661096 for details.
    
    This fixes substituteStream() warnings about missing patterns which
    appeared in the logs.
    S-NA committed Jan 13, 2021
    Copy the full SHA
    96c3470 View commit details
    Browse the repository at this point in the history
  3. firefox: clean up optionals

    Change `lib.optionals a [ b ]` to `lib.optional a b`.
    S-NA committed Jan 13, 2021
    Copy the full SHA
    80e863c View commit details
    Browse the repository at this point in the history
  4. firefox: remove patchelf usage

    Firefox has a number of optional dependencies that get dlopened.
    Instead of using patchelf to set the RPATH use LD_LIBRARY_PATH.
    The motivation for this is we already set LD_LIBRARY_PATH in the
    wrapper on Linux.
    S-NA committed Jan 13, 2021
    Copy the full SHA
    a277fca View commit details
    Browse the repository at this point in the history
  5. firefox: simplify NIX_LDFLAGS usage

    This was required to solve the XPCOMGlueLoad error when building with
    LTO. However, it turns out libxul.so is supposed to have some libraries
    that are reported as not found by ldd. Setting the RPATH worked around
    the error as it forced dependency resolution but failed to fix the real
    issue of broken generation of dependentlibs.list.
    
    The libraries that are reported as not found by ldd are supposed to be
    dlopened through the logic found in nsXPCOMGlue.cpp. However since the
    generation of dependentlibs.list is broken under LTO this did not
    happen. Instead of pulling libwayland-client.so from the GTK libraries
    it found the stub library first (libmozwayland.so). The stub library
    causes (as it should) wl_display_connect to always return NULL which is
    the cause of the segmentation fault and LTO breaking wayland support.
    
    Remove the hardcoded path used for the XPCOMGlueLoad error workaround
    in NIX_LDFLAGS. libunwind is still unfortunately needed. Once the issue
    of the generation of dependentlibs.list being borked is fixed it should
    remedy the wayland crash issue on LTO.
    S-NA committed Jan 13, 2021
    Copy the full SHA
    40b4eb1 View commit details
    Browse the repository at this point in the history
  6. firefox: overhaul LTO

    Enable LTO support on Linux by default again.
    
    Add patch to fix dependentlibs.list generation under LTO. This is
    necessary for fixing firefox-wayland crashing when built with LTO.
    
    Add makeFlags which set ar, ranlib, and nm to be llvm-ar, llvm-ranlib
    and llvm-nm when building with llvm-based LTO. (bmo#1480005)
    S-NA committed Jan 13, 2021
    Copy the full SHA
    7415d05 View commit details
    Browse the repository at this point in the history
  7. firefox: remove python2 dependency

    Python 2 is no longer required to build Firefox.
    S-NA committed Jan 13, 2021
    Copy the full SHA
    dbe008a View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2021

  1. Merge pull request #106617 from S-NA/wip/firefox-improvements

    firefox: fix running wayland firefox built with LTO and some miscellaneous improvements
    lovesegfault committed Jan 16, 2021
    Copy the full SHA
    aa4a14b View commit details
    Browse the repository at this point in the history