Merge #197849: librewolf: fix build on aarch64-linux by upstream patch

2 files changed, 9 insertions, 3 deletions

diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix
index 55451167e0a85..6e81450b22d1b 100644
--- a/pkgs/applications/networking/browsers/librewolf/default.nix
+++ b/pkgs/applications/networking/browsers/librewolf/default.nix
@@ -9,7 +9,7 @@ in
   binaryName = "librewolf";
   version = librewolf-src.packageVersion;
   src = librewolf-src.firefox;
-  inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
+  inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru;
 
   meta = {
     description = "A fork of Firefox, focused on privacy, security and freedom";
diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix
index 68ed776e91c9b..2d0d11a587af2 100644
--- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix
+++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix
@@ -1,4 +1,4 @@
-{ callPackage }:
+{ callPackage, lib, stdenv, fetchpatch }:
 let
   src = callPackage ./src.nix { };
 in
@@ -6,7 +6,13 @@ rec {
 
   inherit (src) packageVersion firefox source;
 
-  extraPatches = [ ./verify-telemetry-macros.patch ];
+  extraPatches = lib.optionals stdenv.isAarch64 [
+    (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1791275
+      name = "no-sysctl-aarch64.patch";
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/0efaf5a00aaceeed679885e4cd393bd9a5fcd0ff";
+      hash = "sha256-wS/KufeLFxCexQalGGNg8+vnQhzDiL79OLt8FtL/JJ8=";
+    })
+  ];
 
   extraConfigureFlags = [
     "--with-app-name=librewolf"