From f4f8338f0eed090c91b59755ddd1b6a8f8d965ad Mon Sep 17 00:00:00 2001 From: Tol Wassman Date: Thu, 16 Jul 2026 02:40:47 +0000 Subject: [PATCH] Revert "buildMozillaMach: backport BZ 2047651 patch for 153" This reverts commit 0374b4e5acc7609fe2cd0a67e48826e709df64f6. --- .../build-mozilla-mach/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index f8298a4c6fe8..58f3f6000a56 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -349,24 +349,6 @@ 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 = ''