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.

5 files changed, 75 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch
index a0f581d84733..a0f581d84733 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-max-64.patch
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-min-65.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-min-65.patch
new file mode 100644
index 000000000000..22088cfe9f70
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-min-65.patch
@@ -0,0 +1,14 @@
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index a8a4b5b..aafe82e 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -303,7 +303,8 @@ static nsresult 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)) {
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-max-64.patch
index de278152f978..de278152f978 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-max-64.patch
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-min-65.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-min-65.patch
new file mode 100644
index 000000000000..708004781efc
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-min-65.patch
@@ -0,0 +1,25 @@
+diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
+index fe0a5af..3df1e0e 100644
+--- a/docshell/base/nsAboutRedirector.cpp
++++ b/docshell/base/nsAboutRedirector.cpp
+@@ -67,8 +67,6 @@ static const RedirEntry kRedirMap[] = {
+     {"about", "chrome://global/content/aboutAbout.xhtml", 0},
+     {"addons", "chrome://mozapps/content/extensions/extensions.xul",
+      nsIAboutModule::ALLOW_SCRIPT},
+-    {"buildconfig", "chrome://global/content/buildconfig.html",
+-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
+     {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
+      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+          nsIAboutModule::ALLOW_SCRIPT},
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 2ec137d..579ef4d 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -36,7 +36,6 @@ toolkit.jar:
+    content/global/plugins.css
+    content/global/browser-child.js
+    content/global/browser-content.js
+-*   content/global/buildconfig.html
+    content/global/buildconfig.css
+    content/global/contentAreaUtils.js
+    content/global/datepicker.xhtml
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 31d6139f3248..adb901518de3 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -4,10 +4,6 @@ let
 
   common = opts: callPackage (import ./common.nix opts) {};
 
-  nixpkgsPatches = [
-    ./env_var_for_system_dir.patch
-  ];
-
 in
 
 rec {
@@ -20,8 +16,9 @@ rec {
       sha512 = "10zbzwpdadj3ap2z66d0bz8l11qkgzlzd22nj7n3k2bzy7rd0m6cfznd9d4mgyl4ivxjv6wz8pasvacrala2dr0m78ysxiz2fpvrahs";
     };
 
-    patches = nixpkgsPatches ++ [
-      ./no-buildconfig.patch
+    patches = [
+      ./env_var_for_system_dir-max-64.patch
+      ./no-buildconfig-max-64.patch
     ];
 
     extraNativeBuildInputs = [ python3 ];
@@ -47,7 +44,9 @@ rec {
       sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9";
     };
 
-    patches = nixpkgsPatches ++ [
+    patches = [
+      ./env_var_for_system_dir-max-64.patch
+
       # this one is actually an omnipresent bug
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
       ./fix-pa-context-connect-retval.patch
@@ -72,8 +71,9 @@ rec {
       sha512 = "3a2r2xyxqw86ihzbmzmxmj8wh3ay4mrjqrnyn73yl6ry19m1pjqbmy1fxnsmxnykfn35a1w18gmbj26kpn1yy7hif37cvy05wmza6c1";
     };
 
-    patches = nixpkgsPatches ++ [
-      ./no-buildconfig.patch
+    patches = [
+      ./env_var_for_system_dir-max-64.patch
+      ./no-buildconfig-max-64.patch
 
       # this one is actually an omnipresent bug
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
@@ -90,6 +90,30 @@ rec {
     };
   };
 
+  firefox-beta = common rec {
+    pname = "firefox";
+    ffversion = "65.0b12";
+    src = fetchurl {
+      url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
+      sha512 = "0f3qy2r9ykb29sv7npwsgir22kybsl24i41abjl1cxsh63dhi9zp9h6k1l4gycrwz6wz9h5hhxalmjkcz3g1nxpijm1dzkqwx0rklrv";
+    };
+
+    patches = [
+      ./env_var_for_system_dir-min-65.patch
+      ./no-buildconfig-min-65.patch
+    ];
+
+    extraNativeBuildInputs = [ python3 ];
+
+    meta = firefox.meta // {
+      description = "A web browser built from Firefox Beta source tree";
+    };
+    updateScript = callPackage ./update.nix {
+      attrPath = "firefox-beta";
+      versionKey = "ffversion";
+    };
+  };
+
 } // (let
 
   tbcommon = args: common (args // {
@@ -107,7 +131,9 @@ rec {
       find . -exec touch -d'2010-01-01 00:00' {} \;
     '';
 
-    patches = nixpkgsPatches;
+    patches = [
+      ./env_var_for_system_dir-max-64.patch
+    ];
 
     meta = {
       description = "A web browser built from TorBrowser source tree";