diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-05-16 22:56:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 22:56:32 +0200 |
| commit | 8a267013a2b0ed26b9540eefe7443fc1e7fb6437 (patch) | |
| tree | a90a9802694bccdae5dda8c3c5328647948ade9f | |
| parent | f150888da6699b4f6215e9bd25d1074c4e756508 (diff) | |
| parent | 4a1f7f84724ef242d5ec9faa25081d558c79be08 (diff) | |
Merge pull request #173235 from squalus/librewolf-fix
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 25eb34c95e826..004a69cf09e21 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 ''; |