pyrox.dev
firefox: 85.0.2 -> 86.0
+2
-1
pkgs/applications/networking/browsers/firefox/common.nix
+2
-1
pkgs/applications/networking/browsers/firefox/common.nix
···
120
120
inherit src unpackPhase meta;
121
121
122
122
patches = [
123
-
./env_var_for_system_dir.patch
124
123
] ++
124
+
lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++
125
+
lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++
125
126
lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++
126
127
lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++
127
128
lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++
+21
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch
+21
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch
···
1
+
diff -r 22fc47c968f2 toolkit/xre/nsXREDirProvider.cpp
2
+
--- a/toolkit/xre/nsXREDirProvider.cpp Mon Dec 14 15:09:17 2020 +0000
3
+
+++ b/toolkit/xre/nsXREDirProvider.cpp Tue Feb 23 23:38:56 2021 +0100
4
+
@@ -11,6 +11,7 @@
5
+
6
+
#include "jsapi.h"
7
+
#include "xpcpublic.h"
8
+
+#include "prenv.h"
9
+
10
+
#include "nsIAppStartup.h"
11
+
#include "nsIFile.h"
12
+
@@ -305,7 +306,8 @@
13
+
"/usr/lib/mozilla"_ns
14
+
# endif
15
+
;
16
+
- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
17
+
+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
18
+
+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));
19
+
# endif
20
+
21
+
if (NS_SUCCEEDED(rv)) {
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch
+2
-2
pkgs/applications/networking/browsers/firefox/packages.nix
+2
-2
pkgs/applications/networking/browsers/firefox/packages.nix
···
7
7
rec {
8
8
firefox = common rec {
9
9
pname = "firefox";
10
-
ffversion = "85.0.2";
10
+
ffversion = "86.0";
11
11
src = fetchurl {
12
12
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
13
-
sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df";
13
+
sha512 = "f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f";
14
14
};
15
15
16
16
meta = {