chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-25.05] buildMozillaMach: restore MOZ_SYSTEM_DIR patch (#437257)

Browse Source
This commit is contained in:
Martin Weinelt
2025-08-26 22:37:42 +02:00
committed by GitHub
parent 3cd58ab8ad 2ae749c34c
commit 767e621ee4
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/build-support/build-mozilla-mach/133-env-var-for-system-dir.patch Normal file
View File

@@ -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<const nsCString&>(dirname), getter_AddRefs(localDir));
# endif
if (NS_SUCCEEDED(rv)) {

3
pkgs/build-support/build-mozilla-mach/default.nix
View File

@@ -304,7 +304,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