From 4a1f7f84724ef242d5ec9faa25081d558c79be08 Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 16 May 2022 13:52:15 -0700 Subject: [PATCH] buildMozillaMach: fix builds with crash reporting disabled - only try to build and copy crash reporting symbols when crash reporting is enabled - fixes the librewolf build --- .../networking/browsers/firefox/common.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 25eb34c95e8..004a69cf09e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -171,8 +171,8 @@ buildStdenv.mkDerivation ({ outputs = [ "out" - "symbols" - ]; + ] + ++ lib.optionals crashreporterSupport [ "symbols" ]; # Add another configure-build-profiling run before the final configure phase if we build with pgo preConfigurePhases = lib.optionals pgoSupport [ @@ -202,7 +202,6 @@ buildStdenv.mkDerivation ({ nativeBuildInputs = [ autoconf cargo - dump_syms llvmPackages.llvm # llvm-objdump makeWrapper nodejs @@ -216,6 +215,7 @@ buildStdenv.mkDerivation ({ which wrapGAppsHook ] + ++ lib.optionals crashreporterSupport [ dump_syms ] ++ lib.optionals pgoSupport [ xvfb-run ] ++ extraNativeBuildInputs; @@ -421,11 +421,11 @@ buildStdenv.mkDerivation ({ # Generate build symbols once after the final build # https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html - preInstall = '' + preInstall = lib.optionalString crashreporterSupport '' ./mach buildsymbols mkdir -p $symbols/ cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ - + '' + '' cd mozobj '';