Merge pull request #173235 from squalus/librewolf-fix

main
Martin Weinelt 2 years ago committed by GitHub
commit 8a267013a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      pkgs/applications/networking/browsers/firefox/common.nix

@ -171,8 +171,8 @@ buildStdenv.mkDerivation ({
outputs = [ outputs = [
"out" "out"
"symbols" ]
]; ++ lib.optionals crashreporterSupport [ "symbols" ];
# Add another configure-build-profiling run before the final configure phase if we build with pgo # Add another configure-build-profiling run before the final configure phase if we build with pgo
preConfigurePhases = lib.optionals pgoSupport [ preConfigurePhases = lib.optionals pgoSupport [
@ -202,7 +202,6 @@ buildStdenv.mkDerivation ({
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoconf
cargo cargo
dump_syms
llvmPackages.llvm # llvm-objdump llvmPackages.llvm # llvm-objdump
makeWrapper makeWrapper
nodejs nodejs
@ -216,6 +215,7 @@ buildStdenv.mkDerivation ({
which which
wrapGAppsHook wrapGAppsHook
] ]
++ lib.optionals crashreporterSupport [ dump_syms ]
++ lib.optionals pgoSupport [ xvfb-run ] ++ lib.optionals pgoSupport [ xvfb-run ]
++ extraNativeBuildInputs; ++ extraNativeBuildInputs;
@ -421,11 +421,11 @@ buildStdenv.mkDerivation ({
# Generate build symbols once after the final build # Generate build symbols once after the final build
# https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html # https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html
preInstall = '' preInstall = lib.optionalString crashreporterSupport ''
./mach buildsymbols ./mach buildsymbols
mkdir -p $symbols/ mkdir -p $symbols/
cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ cp mozobj/dist/*.crashreporter-symbols.zip $symbols/
'' + ''
cd mozobj cd mozobj
''; '';

Loading…
Cancel
Save