diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-04-28 22:14:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 22:14:33 +0200 |
| commit | 17b00c9e559a87eeeef93a5ad12358ff6d08a667 (patch) | |
| tree | 5d20543592046664fb22b190e81d25903188c6dc | |
| parent | 4657c277551983c362d3996d8d99dbdcb9837a88 (diff) | |
| parent | 365041415b7c2b9a16cc753096da4d9e46f85d8d (diff) | |
Merge pull request #228739 from mweinelt/firefox-mozbz1830040
buildMozillaMach: Apply musl compat patch up to 114.0
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 46d99f9c5a6b5..8cac0d6fe13be 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -230,8 +230,9 @@ buildStdenv.mkDerivation ({ url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb"; hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA="; }) - ] ++ [ + ] ++ lib.optionals (lib.versionOlder version "114.0") [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1830040 + # https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8 (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12"; hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A="; |