dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

buildMozillaMach: add curl into crashreporter rpath

Browse Source 
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.
This commit is contained in:
Martin Weinelt 2022-11-08 00:02:25 +01:00
parent c93efc89ea
commit 6acfc788cc
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/browsers/firefox/common.nix
View File

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