Skip to content

Commit a7ca865

Browse files
committed
buildMozillaMach: prune patches
These do not apply to any version we carry any longer.
1 parent 0238df3 commit a7ca865

File tree

2 files changed

+4
-109
lines changed

2 files changed

+4
-109
lines changed

pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch

Lines changed: 0 additions & 80 deletions
This file was deleted.

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

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -234,42 +234,17 @@ buildStdenv.mkDerivation {
234234
"profilingPhase"
235235
];
236236

237-
patches = lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [
238-
# dbus cflags regression fix
239-
# https://bugzilla.mozilla.org/show_bug.cgi?id=1864083
240-
(fetchpatch {
241-
url = "https://hg.mozilla.org/mozilla-central/raw-rev/f1f5f98290b3";
242-
hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI=";
243-
})
244-
]
245-
++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch
246-
++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch
247-
++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch
248-
++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [
249-
(fetchpatch {
250-
# Do not crash on systems without an expected statically assumed page size.
251-
# https://phabricator.services.mozilla.com/D194458
252-
name = "mozbz1866025.patch";
253-
url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951";
254-
hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
255-
})
256-
]
257-
++ lib.optionals (lib.versionOlder version "122") [
258-
./bindgen-0.64-clang-18.patch
259-
]
260-
++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [
261-
./122.0-libvpx-mozbz1875201.patch
262-
]
237+
patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
238+
++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
239+
++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
240+
++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch ]
263241
++ lib.optionals (lib.versionOlder version "123") [
264242
(fetchpatch {
265243
name = "clang-18.patch";
266244
url = "https://hg.mozilla.org/mozilla-central/raw-rev/ba6abbd36b496501cea141e17b61af674a18e279";
267245
hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
268246
})
269247
]
270-
++ lib.optionals (lib.versionOlder version "115.12") [
271-
./rust-1.78.patch
272-
]
273248
++ extraPatches;
274249

275250
postPatch = ''

0 commit comments

Comments
 (0)