Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 58b019cc3cda
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d3ff5bf4e3c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 9, 2020

  1. firefox: Fix AArch64 build 

    This is the equivalent change to d4446c5

That particular change could not be backported as-is due to refactors in
the firefox derivation.
    @samueldr
    samueldr committed Mar 9, 2020
    Copy the full SHA
    23d18e2 View commit details

  2. Merge pull request #82171 from samueldr/19.09/aarch64/firefox 

    [19.09] firefox: Fix AArch64 build
    @samueldr
    samueldr authored Mar 9, 2020
    Copy the full SHA
    8d3ff5b View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/applications/networking/browsers/firefox/common.nix
5 changes: 5 additions & 0 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -120,6 +120,11 @@ let
sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
})
]
++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch {
# https://phabricator.services.mozilla.com/D60667
url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66";
sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p";
})
++ patches;

nss_pkg = if lib.versionAtLeast ffversion "71" then nss_3_49_2 else nss;