Unverified Commit 17b00c9e authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #228739 from mweinelt/firefox-mozbz1830040 

buildMozillaMach: Apply musl compat patch up to 114.0
parents 4657c277 36504141

pkgs/applications/networking/browsers/firefox/common.nix

+2 −1
Original line number Diff line number Diff line
@@ -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=";