diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-11-08 00:02:25 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-11-08 07:52:12 +0100 |
| commit | 6acfc788cc93f6e79a2dee1faf4328df208835f0 (patch) | |
| tree | 2c41fffbf9cbdd0bfbb461a94c2d840e4334b643 /pkgs | |
| parent | c93efc89ea3a67b081e39969b05f306f50f97397 (diff) | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index d144db1728681..19e0f2e966116 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 |