From 365041415b7c2b9a16cc753096da4d9e46f85d8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Apr 2023 16:28:46 +0200 Subject: [PATCH] buildMozillaMach: Apply musl compat patch up to 114.0 A slightly modified version landed in 114.0a1. Related: mozbz#1830040 --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 46d99f9c5a6b..8cac0d6fe13b 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=";