diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 58f3f6000a56..f8298a4c6fe8 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -349,6 +349,24 @@ buildStdenv.mkDerivation { # https://bugzilla.mozilla.org/show_bug.cgi?id=2046162 ./153-cbindgen-0.29.4-compat.patch ] + ++ + # Fixes `ld.lld: error: undefined symbol: FREEBL_GetVector` + # https://bugzilla.mozilla.org/show_bug.cgi?id=2047651 + lib.optionals + ( + lib.versionAtLeast version "153" + && lib.versionOlder version "154" + # We don't set --with-system-nss on Darwin, so it should be + # unaffected. + && !stdenv.hostPlatform.isDarwin + ) + [ + (fetchpatch { + name = "link-freebl-explicitly-for-system-nss-builds.patch"; + url = "https://hg-edge.mozilla.org/mozilla-central/raw-rev/1a56071ddc0fe97a55c3b825e1dd33c8422b9fc1"; + hash = "sha256-+HiU7RMPmV7I7SIzjP0Q6iSDJL/vBjc3UcwUTg57lNQ="; + }) + ] ++ extraPatches; postPatch = ''