From fd0ad4fee834fa585bc70424c0e67003015671a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Aug 2025 21:39:41 +0200 Subject: [PATCH] buildMozillaMach: restore MOZ_SYSTEM_DIR patch Accidentally dropped while pruning obsolete patches. --- .../133-env-var-for-system-dir.patch | 22 +++++++++++++++++++ .../build-mozilla-mach/default.nix | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch diff --git a/pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch b/pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch new file mode 100644 index 000000000000..f35569c5909f --- /dev/null +++ b/pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch @@ -0,0 +1,22 @@ +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index 6db876975187..5882c5d7f1d6 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -11,6 +11,7 @@ + + #include "jsapi.h" + #include "xpcpublic.h" ++#include "prenv.h" + #include "prprf.h" + + #include "nsIAppStartup.h" +@@ -297,7 +297,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) { + "/usr/lib/mozilla"_ns + # endif + ; +- rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir)); ++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); ++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast(dirname), getter_AddRefs(localDir)); + # endif + + if (NS_SUCCEEDED(rv)) { diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 043fc8ec537d..790ca307cdb1 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -305,7 +305,10 @@ buildStdenv.mkDerivation { ]; patches = + # Remove references to the build clsoure lib.optionals (lib.versionAtLeast version "136") [ ./136-no-buildconfig.patch ] + # Add MOZ_SYSTEM_DIR env var for native messaging host support + ++ lib.optionals (lib.versionAtLeast version "133") [ ./133-env-var-for-system-dir.patch ] ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1955112 # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9