about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-01-26 12:09:07 +0000
committerAlyssa Ross <hi@alyssa.is>2019-01-27 15:08:17 +0000
commite29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf (patch)
treefc0d6ad04e52d8a4eee9e72ed9291fac9cc27626 /nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch
parentfde4bbe2c271c3561f86d8da476e66929bbba87f (diff)
downloadnixlib-e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf.tar
nixlib-e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf.tar.gz
nixlib-e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf.tar.bz2
nixlib-e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf.tar.lz
nixlib-e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf.tar.xz
nixlib-e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf.tar.zst
nixlib-e29dd58a0de91c3a3b6b5ebf1b2f02a648b4f9bf.zip
firefox-beta: init at 65.0b12
We have all the other (non-nightly) Firefox channels, so it makes sense
to have beta as well. Additionally, it should allow us to better prepare
for Firefox releases better, and have them available faster, if we keep
the beta up to date.
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch')
-rw-r--r--nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch
new file mode 100644
index 000000000000..a0f581d84733
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch
@@ -0,0 +1,14 @@
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index 380c1c1..255539f 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -306,7 +306,8 @@ GetSystemParentDirectory(nsIFile** aFile)
+                            "/usr/lib/mozilla"
+ #endif
+                            );
+-  rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
++  const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
++  rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));
+ #endif
+ 
+   if (NS_SUCCEEDED(rv)) {