From 6acfc788cc93f6e79a2dee1faf4328df208835f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Nov 2022 00:02:25 +0100
Subject: [PATCH] buildMozillaMach: add curl into crashreporter rpath

Firefox has been crashy during the 106 cycle on my laptop, so I saw the
crashreporter more often than not. In the terminal spew I found

> Failed to open curl lib from binary, use libcurl.so instead

and the GUI told me submitting the report had failed. Not great if you
actually except to have your bugs fixed at some point.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index d144db172868..19e0f2e96611 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -22,6 +22,7 @@
 , pkgs
 , stdenv
 , fetchpatch
+, patchelf
 
 # build time
 , autoconf
@@ -101,7 +102,7 @@
 # WARNING: NEVER set any of the options below to `true` by default.
 # Set to `!privacySupport` or `false`.
 
-, crashreporterSupport ? !privacySupport
+, crashreporterSupport ? !privacySupport, curl
 , geolocationSupport ? !privacySupport
 , googleAPISupport ? geolocationSupport
 , mlsAPISupport ? geolocationSupport
@@ -263,7 +264,7 @@ buildStdenv.mkDerivation ({
     which
     wrapGAppsHook
   ]
-  ++ lib.optionals crashreporterSupport [ dump_syms ]
+  ++ lib.optionals crashreporterSupport [ dump_syms patchelf ]
   ++ lib.optionals pgoSupport [ xvfb-run ]
   ++ extraNativeBuildInputs;
 
@@ -534,6 +535,10 @@ buildStdenv.mkDerivation ({
     }
   '';
 
+  postFixup = lib.optionalString crashreporterSupport ''
+    patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter
+  '';
+
   doInstallCheck = true;
   installCheckPhase = ''
     # Some basic testing