From 5cca8c79aaa12c23ab6749f1f4ad5af8ba7d0e67 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Thu, 7 Jul 2022 22:47:19 +0200
Subject: [PATCH 1/2] palemoon: 31.1.0 -> 31.1.1

(cherry picked from commit b17f522053dbd627bc599f9cab3a7f63200778de)
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 6 +++---
 pkgs/applications/networking/browsers/palemoon/mozconfig   | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index c4c00d563786..f359f05c18ba 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -45,15 +45,15 @@ assert with lib.strings; (
 
 stdenv.mkDerivation rec {
   pname = "palemoon";
-  version = "31.1.0";
+  version = "31.1.1";
 
   src = fetchFromGitea {
     domain = "repo.palemoon.org";
     owner = "MoonchildProductions";
     repo = "Pale-Moon";
-    rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0
+    rev = "${version}_Release";
     fetchSubmodules = true;
-    sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4=";
+    sha256 = "sha256-lKD6+mXHWkNLc1XAX5mJGmwgz60P8mH+zrOi2WoOyJU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig
index 65143fdac187..d680dc1ab44c 100644
--- a/pkgs/applications/networking/browsers/palemoon/mozconfig
+++ b/pkgs/applications/networking/browsers/palemoon/mozconfig
@@ -19,7 +19,10 @@ ac_add_options --enable-jemalloc
 ac_add_options --enable-strip
 ac_add_options --enable-devtools
 ac_add_options --enable-av1
+ac_add_options --enable-phoenix-extensions
 
+ac_add_options --disable-eme
+ac_add_options --disable-webrtc
 ac_add_options --disable-gamepad
 ac_add_options --disable-tests
 ac_add_options --disable-debug
@@ -34,8 +37,10 @@ export MOZILLA_OFFICIAL=1
 
 ac_add_options --x-libraries=@xlibs@
 
+# MOZ_PKG_SPECIAL is only relevant for upstream's packaging
+
 #
-# NixOS-specific adjustments
+# NixOS-specific additions
 #
 
 ac_add_options --prefix=@prefix@

From 5cdff167e71c6094904ba621682be52175a9e88e Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Fri, 8 Jul 2022 01:24:25 +0200
Subject: [PATCH 2/2] palemoon: Further limit build cores count

Still not consistent with 32. Let's try upstream's job count for releases.

(cherry picked from commit 2cc04ccafe7775b498ac9fbf33e828ec2a098059)
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index f359f05c18ba..e4325267e600 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
 
     # Too many cores can lead to build flakiness
     # https://forum.palemoon.org/viewtopic.php?f=5&t=28480
-    export jobs=$(($NIX_BUILD_CORES<=32 ? $NIX_BUILD_CORES : 32))
+    export jobs=$(($NIX_BUILD_CORES<=20 ? $NIX_BUILD_CORES : 20))
     if [ -z "$enableParallelBuilding" ]; then
       jobs=1
     fi