From 0026f502790530b21668f81bd0fcdc635e2160e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 29 Jul 2025 18:43:21 +0200 Subject: [PATCH] buildMozillaMach: migrate into build-support The builder has multiple consumers, so it is fine to separate it from Firefox, but the main motivation is to separate code ownership between the builder and individual firefox versions. --- ci/OWNERS | 1 + .../build-mozilla-mach}/139-relax-apple-sdk.patch | 0 .../build-mozilla-mach}/139-wayland-drag-animation.patch | 0 .../build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch | 0 .../common.nix => build-support/build-mozilla-mach/default.nix} | 0 .../build-mozilla-mach}/env_var_for_system_dir-ff111.patch | 0 .../build-mozilla-mach}/env_var_for_system_dir-ff133.patch | 0 .../firefox-cannot-find-type-Allocator.patch | 0 .../build-mozilla-mach}/firefox-mac-missing-vector-header.patch | 0 .../build-mozilla-mach}/no-buildconfig-ffx121.patch | 0 .../build-mozilla-mach}/no-buildconfig-ffx136.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 12 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/139-relax-apple-sdk.patch (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/139-wayland-drag-animation.patch (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch (100%) rename pkgs/{applications/networking/browsers/firefox/common.nix => build-support/build-mozilla-mach/default.nix} (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/env_var_for_system_dir-ff111.patch (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/env_var_for_system_dir-ff133.patch (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/firefox-cannot-find-type-Allocator.patch (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/firefox-mac-missing-vector-header.patch (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/no-buildconfig-ffx121.patch (100%) rename pkgs/{applications/networking/browsers/firefox => build-support/build-mozilla-mach}/no-buildconfig-ffx136.patch (100%) diff --git a/ci/OWNERS b/ci/OWNERS index 7866a8e36e65..c59e5dc3bb81 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -234,6 +234,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /nixos/tests/snapcast.nix @mweinelt # Browsers +/pkgs/build-support/build-mozilla-mach @mweinelt /pkgs/applications/networking/browsers/librewolf @squalus @DominicWrege @fpletz @LordGrimmauld /pkgs/applications/networking/browsers/firefox @mweinelt /pkgs/applications/networking/browsers/chromium @emilylange @networkException diff --git a/pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch rename to pkgs/build-support/build-mozilla-mach/139-relax-apple-sdk.patch diff --git a/pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch b/pkgs/build-support/build-mozilla-mach/139-wayland-drag-animation.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/139-wayland-drag-animation.patch rename to pkgs/build-support/build-mozilla-mach/139-wayland-drag-animation.patch diff --git a/pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch b/pkgs/build-support/build-mozilla-mach/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch rename to pkgs/build-support/build-mozilla-mach/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/build-support/build-mozilla-mach/default.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox/common.nix rename to pkgs/build-support/build-mozilla-mach/default.nix diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch b/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch rename to pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff111.patch diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch b/pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch rename to pkgs/build-support/build-mozilla-mach/env_var_for_system_dir-ff133.patch diff --git a/pkgs/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch b/pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/firefox-cannot-find-type-Allocator.patch rename to pkgs/build-support/build-mozilla-mach/firefox-cannot-find-type-Allocator.patch diff --git a/pkgs/applications/networking/browsers/firefox/firefox-mac-missing-vector-header.patch b/pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/firefox-mac-missing-vector-header.patch rename to pkgs/build-support/build-mozilla-mach/firefox-mac-missing-vector-header.patch diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch b/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch rename to pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx121.patch diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch b/pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx136.patch rename to pkgs/build-support/build-mozilla-mach/no-buildconfig-ffx136.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5062eb74a5fb..ef68703e4a80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12185,7 +12185,7 @@ with pkgs; }; buildMozillaMach = - opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { }; + opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { }; firefox-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox.nix { inherit